summaryrefslogtreecommitdiffstats
path: root/sshbuf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-06-01 08:58:25 +0200
committerDamien Miller <djm@mindrot.org>2017-06-07 03:31:15 +0200
commitcc812baf39b93d5355565da98648d8c31f955990 (patch)
tree58f8ea1dc3f37e67a1741cab8a5514f334ad782e /sshbuf.c
parentavoid compiler warning (diff)
downloadopenssh-cc812baf39b93d5355565da98648d8c31f955990.tar.xz
openssh-cc812baf39b93d5355565da98648d8c31f955990.zip
upstream commit
unconditionally zero init size of buffer; ok markus@ deraadt@ Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29
Diffstat (limited to '')
-rw-r--r--sshbuf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshbuf.c b/sshbuf.c
index b7a90b5c2..de783a363 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 @@ 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