upstream: change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a

1 files changed, 4 insertions, 7 deletions

diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index c0336e867..9b5aa208c 100644
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sshbuf-misc.c,v 1.13 2020/01/25 23:28:06 djm Exp $    */
+/*      $OpenBSD: sshbuf-misc.c,v 1.14 2020/02/26 13:40:09 jsg Exp $    */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -156,17 +156,14 @@ 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) {
-                explicit_bzero(p, plen);
-                free(p);
+                freezero(p, plen);
                 return SSH_ERR_INVALID_FORMAT;
         }
         if ((r = sshbuf_put(buf, p, nlen)) < 0) {
-                explicit_bzero(p, plen);
-                free(p);
+                freezero(p, plen);
                 return r;
         }
-        explicit_bzero(p, plen);
-        free(p);
+        freezero(p, plen);
         return 0;
 }