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, 5 deletions

diff --git a/src/lib/libcrypto/bn/bn_asm.c b/src/lib/libcrypto/bn/bn_asm.c
index 49f0ba5d7b..993fbb3dc5 100644
--- a/src/lib/libcrypto/bn/bn_asm.c
+++ b/src/lib/libcrypto/bn/bn_asm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_asm.c,v 1.14 2015/02/25 15:39:49 bcook Exp $ */
+/* $OpenBSD: bn_asm.c,v 1.15 2017/05/02 03:59:44 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -989,8 +989,7 @@ enter:
         }
         memcpy(rp, tp, num * sizeof(BN_ULONG));
 out:
-        explicit_bzero(tp, (num + 2) * sizeof(BN_ULONG));
-        free(tp);
+        freezero(tp, (num + 2) * sizeof(BN_ULONG));
         return 1;
 }
 #else
@@ -1081,8 +1080,7 @@ bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
         }
         memcpy(rp, tp, num * sizeof(BN_ULONG));
 out:
-        explicit_bzero(tp, (num + 2) * sizeof(BN_ULONG));
-        free(tp);
+        freezero(tp, (num + 2) * sizeof(BN_ULONG));
         return 1;
 }
 #else