summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshbuf.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-06-01 06:58:25 +0000
committerdjm <djm@openbsd.org>2017-06-01 06:58:25 +0000
commit327b1c6901b201747478c92e89ce6c54b9be2853 (patch)
treef8c9c9cd59e010e7077402d3419e53c5ea2bd453 /usr.bin/ssh/sshbuf.c
parentsome warnings spotted by clang; ok markus@ (diff)
downloadwireguard-openbsd-327b1c6901b201747478c92e89ce6c54b9be2853.tar.xz
wireguard-openbsd-327b1c6901b201747478c92e89ce6c54b9be2853.zip
unconditionally zero init size of buffer; ok markus@ deraadt@
Diffstat (limited to 'usr.bin/ssh/sshbuf.c')
-rw-r--r--usr.bin/ssh/sshbuf.c6
1 files changed, 3 insertions, 3 deletions
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