4 files changed, 14 insertions, 31 deletions

diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
index 711b01f149..e10af97d36 100644
--- a/src/lib/libcrypto/asn1/a_object.c
+++ b/src/lib/libcrypto/asn1/a_object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_object.c,v 1.29 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: a_object.c,v 1.30 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -231,8 +231,7 @@ i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
                 return -1;
         i = i2t_ASN1_OBJECT(tmp, tlen, a);
         if (i > (int)(tlen - 1)) {
-                explicit_bzero(tmp, tlen);
-                free(tmp);
+                freezero(tmp, tlen);
                 if ((tmp = malloc(i + 1)) == NULL)
                         return -1;
                 tlen = i + 1;
@@ -242,8 +241,7 @@ i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
                 i = BIO_write(bp, "<INVALID>", 9);
         else
                 i = BIO_write(bp, tmp, i);
-        explicit_bzero(tmp, tlen);
-        free(tmp);
+        freezero(tmp, tlen);
         return (i);
 }
 
@@ -319,9 +317,7 @@ c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long len)
 
         /* detach data from object */
         data = (unsigned char *)ret->data;
-        if (data != NULL)
-                explicit_bzero(data, ret->length);
-        free(data);
+        freezero(data, ret->length);
 
         data = malloc(length);
         if (data == NULL) {
@@ -380,9 +376,7 @@ ASN1_OBJECT_free(ASN1_OBJECT *a)
                 a->sn = a->ln = NULL;
         }
         if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_DATA) {
-                if (a->data != NULL)
-                        explicit_bzero((void *)a->data, a->length);
-                free((void *)a->data);
+                freezero((void *)a->data, a->length);
                 a->data = NULL;
                 a->length = 0;
         }
diff --git a/src/lib/libcrypto/asn1/a_sign.c b/src/lib/libcrypto/asn1/a_sign.c
index 4e545eb719..df955be745 100644
--- a/src/lib/libcrypto/asn1/a_sign.c
+++ b/src/lib/libcrypto/asn1/a_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_sign.c,v 1.22 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: a_sign.c,v 1.23 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -227,13 +227,7 @@ ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
 
 err:
         EVP_MD_CTX_cleanup(ctx);
-        if (buf_in != NULL) {
-                explicit_bzero((char *)buf_in, inl);
-                free(buf_in);
-        }
-        if (buf_out != NULL) {
-                explicit_bzero((char *)buf_out, outll);
-                free(buf_out);
-        }
+        freezero((char *)buf_in, inl);
+        freezero((char *)buf_out, outll);
         return (outl);
 }
diff --git a/src/lib/libcrypto/asn1/a_verify.c b/src/lib/libcrypto/asn1/a_verify.c
index 8f8e58c095..6f0cd1080b 100644
--- a/src/lib/libcrypto/asn1/a_verify.c
+++ b/src/lib/libcrypto/asn1/a_verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_verify.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: a_verify.c,v 1.24 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -148,8 +148,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
                 goto err;
         }
 
-        explicit_bzero(buf_in, (unsigned int)inl);
-        free(buf_in);
+        freezero(buf_in, (unsigned int)inl);
 
         if (EVP_DigestVerifyFinal(&ctx, signature->data,
             (size_t)signature->length) <= 0) {
diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index a90873d54a..852644a781 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_lib.c,v 1.38 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: asn1_lib.c,v 1.39 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -401,9 +401,7 @@ ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
 void
 ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
 {
-        if (str->data != NULL)
-                explicit_bzero(str->data, str->length);
-        free(str->data);
+        freezero(str->data, str->length);
         str->data = data;
         str->length = len;
 }
@@ -436,10 +434,8 @@ ASN1_STRING_free(ASN1_STRING *a)
 {
         if (a == NULL)
                 return;
-        if (a->data != NULL && !(a->flags & ASN1_STRING_FLAG_NDEF)) {
-                explicit_bzero(a->data, a->length);
-                free(a->data);
-        }
+        if (a->data != NULL && !(a->flags & ASN1_STRING_FLAG_NDEF))
+                freezero(a->data, a->length);
         free(a);
 }