From: djm <djm@openbsd.org>
Date: Thu, 1 Jun 2017 06:58:25 +0000 (+0000)
Subject: unconditionally zero init size of buffer; ok markus@ deraadt@
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=327b1c6901b201747478c92e89ce6c54b9be2853;p=openbsd

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

diff --git a/usr.bin/ssh/sshbuf.c b/usr.bin/ssh/sshbuf.c
index c97808005ec..c4735fe7bd6 100644
--- a/usr.bin/ssh/sshbuf.c
+++ b/usr.bin/ssh/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
  *
@@ -199,8 +199,8 @@ sshbuf_reset(struct sshbuf *buf)
 			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