use freezero() instead of memset/explicit_bzero + free. Substantially

reduces conditional logic (-218, +82).

MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH cache alignment calculation bn/bn_exp.c
wasn'tt quite right.  Two other tricky bits with ASN1_STRING_FLAG_NDEF and
BN_FLG_STATIC_DATA where the condition cannot be collapsed completely.

Passes regress.  ok beck

1 files changed, 4 insertions, 11 deletions

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index b2c72e1d76..0f7c36d21c 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.44 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.45 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -425,10 +425,7 @@ err:
         explicit_bzero(iv, sizeof(iv));
         explicit_bzero((char *)&ctx, sizeof(ctx));
         explicit_bzero(buf, PEM_BUFSIZE);
-        if (data != NULL) {
-                explicit_bzero(data, (unsigned int)dsize);
-                free(data);
-        }
+        freezero(data, (unsigned int)dsize);
         return (ret);
 }
 
@@ -626,8 +623,7 @@ PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
         EVP_EncodeFinal(&ctx, buf, &outl);
         if ((outl > 0) && (BIO_write(bp, (char *)buf, outl) != outl))
                 goto err;
-        explicit_bzero(buf, PEM_BUFSIZE * 8);
-        free(buf);
+        freezero(buf, PEM_BUFSIZE * 8);
         buf = NULL;
         if ((BIO_write(bp, "-----END ", 9) != 9) ||
             (BIO_write(bp, name, nlen) != nlen) ||
@@ -636,10 +632,7 @@ PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
         return (i + outl);
 
 err:
-        if (buf) {
-                explicit_bzero(buf, PEM_BUFSIZE * 8);
-                free(buf);
-        }
+        freezero(buf, PEM_BUFSIZE * 8);
         PEMerror(reason);
         return (0);
 }