From 2b561cb0e87f2ee535e8c64907883cd275ad3fec Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 2 May 2017 03:59:45 +0000
Subject: 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
---
 src/lib/libcrypto/ecdsa/ecs_lib.c | 6 ++----
 src/lib/libcrypto/ecdsa/ecs_vrf.c | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/lib/libcrypto/ecdsa')

diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c
index ca0f51b366..4fbe1e060b 100644
--- a/src/lib/libcrypto/ecdsa/ecs_lib.c
+++ b/src/lib/libcrypto/ecdsa/ecs_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_lib.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ecs_lib.c,v 1.12 2017/05/02 03:59:44 deraadt Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
@@ -169,9 +169,7 @@ ecdsa_data_free(void *data)
 #endif
 	CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, r, &r->ex_data);
 
-	explicit_bzero((void *)r, sizeof(ECDSA_DATA));
-
-	free(r);
+	freezero(r, sizeof(ECDSA_DATA));
 }
 
 ECDSA_DATA *
diff --git a/src/lib/libcrypto/ecdsa/ecs_vrf.c b/src/lib/libcrypto/ecdsa/ecs_vrf.c
index a4b627ace6..270af94c0d 100644
--- a/src/lib/libcrypto/ecdsa/ecs_vrf.c
+++ b/src/lib/libcrypto/ecdsa/ecs_vrf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_vrf.c,v 1.5 2015/02/08 13:35:07 jsing Exp $ */
+/* $OpenBSD: ecs_vrf.c,v 1.6 2017/05/02 03:59:44 deraadt Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -107,10 +107,7 @@ ECDSA_verify(int type, const unsigned char *dgst, int dgst_len,
 	ret = ECDSA_do_verify(dgst, dgst_len, s, eckey);
 
 err:
-	if (derlen > 0) {
-		explicit_bzero(der, derlen);
-		free(der);
-	}
+	freezero(der, derlen);
 	ECDSA_SIG_free(s);
 	return (ret);
 }
-- 
cgit v1.2.3-55-g6feb