upstream commit
some more bzero->explicit_bzero, from Michael McConville
Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0
diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index d022065..3da4b80 100644
--- a/sshbuf-misc.c
+++ b/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
*
@@ -103,7 +103,7 @@
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;
}
@@ -122,16 +122,16 @@
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;
}