commit cc812baf39b93d5355565da98648d8c31f955990
author djm@openbsd.org <djm@openbsd.org> Thu Jun 01 06:58:25 2017 +0000
committer Damien Miller <djm@mindrot.org> Wed Jun 07 11:31:15 2017 +1000
tree 58f8ea1dc3f37e67a1741cab8a5514f334ad782e
parent 65eb8fae0d7ba45ef4483a3cf0ae7fd0dbc7c226

upstream commit

unconditionally zero init size of buffer; ok markus@
deraadt@

Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29

sshbuf.c

diff --git a/sshbuf.c b/sshbuf.c
index b7a90b5..de783a3 100644
--- a/sshbuf.c
+++ b/sshbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf.c,v 1.10 2017/05/31 09:15:42 deraadt Exp $	*/
+/*	$OpenBSD: sshbuf.c,v 1.11 2017/06/01 06:58:25 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -201,8 +201,8 @@
 			buf->cd = buf->d = d;
 			buf->alloc = SSHBUF_SIZE_INIT;
 		}
-	} else
-		explicit_bzero(buf->d, SSHBUF_SIZE_INIT);
+	}
+	explicit_bzero(buf->d, SSHBUF_SIZE_INIT);
 }
 
 size_t