some more bzero->explicit_bzero, from Michael McConville

diff --git a/usr.bin/ssh/sshbuf-misc.c b/usr.bin/ssh/sshbuf-misc.c
index 9c54115..2f75803 100644 (file)
--- a/usr.bin/ssh/sshbuf-misc.c
+++ b/usr.bin/ssh/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf-misc.c,v 1.4 2015/03/24 20:03:44 markus Exp $  */
+/*     $OpenBSD: sshbuf-misc.c,v 1.5 2015/10/05 17:11:21 djm Exp $     */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -99,7 +99,7 @@ sshbuf_dtob64(struct sshbuf *buf)
        if (SIZE_MAX / 2 <= len || (ret = malloc(plen)) == NULL)
                return NULL;
        if ((r = b64_ntop(p, len, ret, plen)) == -1) {
-               bzero(ret, plen);
+               explicit_bzero(ret, plen);
                free(ret);
                return NULL;
        }
@@ -118,16 +118,16 @@ sshbuf_b64tod(struct sshbuf *buf, const char *b64)
        if ((p = malloc(plen)) == NULL)
                return SSH_ERR_ALLOC_FAIL;
        if ((nlen = b64_pton(b64, p, plen)) < 0) {
-               bzero(p, plen);
+               explicit_bzero(p, plen);
                free(p);
                return SSH_ERR_INVALID_FORMAT;
        }
        if ((r = sshbuf_put(buf, p, nlen)) < 0) {
-               bzero(p, plen);
+               explicit_bzero(p, plen);
                free(p);
                return r;
        }
-       bzero(p, plen);
+       explicit_bzero(p, plen);
        free(p);
        return 0;
 }

diff --git a/usr.bin/ssh/sshbuf.c b/usr.bin/ssh/sshbuf.c
index 5bc729a..e3f42d2 100644 (file)
--- a/usr.bin/ssh/sshbuf.c
+++ b/usr.bin/ssh/sshbuf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshbuf.c,v 1.3 2015/01/20 23:14:00 deraadt Exp $      */
+/*     $OpenBSD: sshbuf.c,v 1.4 2015/10/05 17:11:21 djm Exp $  */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -175,7 +175,7 @@ sshbuf_free(struct sshbuf *buf)
                return;
        dont_free = buf->dont_free;
        if (!buf->readonly) {
-               bzero(buf->d, buf->alloc);
+               explicit_bzero(buf->d, buf->alloc);
                free(buf->d);
        }
        bzero(buf, sizeof(*buf));