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, 3 insertions, 9 deletions

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);
 }