From b7d5fcfa073d6408fd2af787acdc717bb412fd8f Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 5 Nov 2018 23:46:16 +0000
Subject: Remove two unnecessary BN_FLG_CONSTTIME dances: BN_mod_exp_ct()
 already takes care of this internally.

ok beck jsing
---
 src/lib/libcrypto/dh/dh_key.c   | 16 ++++------------
 src/lib/libcrypto/dsa/dsa_key.c | 12 +++---------
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 3920a00d09..dd3a3af3ab 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_key.c,v 1.29 2018/06/12 15:33:18 sthen Exp $ */
+/* $OpenBSD: dh_key.c,v 1.30 2018/11/05 23:46:16 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -153,17 +153,9 @@ generate_key(DH *dh)
 		}
 	}
 
-	{
-		BIGNUM prk;
-
-		BN_init(&prk);
-		BN_with_flags(&prk, priv_key, BN_FLG_CONSTTIME);
-
-		if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, &prk, dh->p, ctx,
-		    mont)) {
-			goto err;
-		}
-	}
+	if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, priv_key, dh->p, ctx,
+	    mont))
+		goto err;
 
 	dh->pub_key = pub_key;
 	dh->priv_key = priv_key;
diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index cb95e1369c..b2d08e5e0c 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_key.c,v 1.23 2017/01/21 09:38:59 beck Exp $ */
+/* $OpenBSD: dsa_key.c,v 1.24 2018/11/05 23:46:16 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -104,14 +104,8 @@ dsa_builtin_keygen(DSA *dsa)
 	} else
 		pub_key=dsa->pub_key;
 	
-	{
-		BIGNUM prk;
-
-		BN_with_flags(&prk, priv_key, BN_FLG_CONSTTIME);
-
-		if (!BN_mod_exp_ct(pub_key, dsa->g, &prk, dsa->p, ctx))
-			goto err;
-	}
+	if (!BN_mod_exp_ct(pub_key, dsa->g, priv_key, dsa->p, ctx))
+		goto err;
 
 	dsa->priv_key = priv_key;
 	dsa->pub_key = pub_key;
-- 
cgit v1.2.3-55-g6feb