revert use of bn_rand_interval due to failures with ECDHE and TLS

1 files changed, 6 insertions, 9 deletions

diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 17df620ec5..3da2413666 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.32 2018/11/05 23:54:27 tb Exp $ */
+/* $OpenBSD: dh_key.c,v 1.33 2018/11/06 02:14:39 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -106,7 +106,7 @@ generate_key(DH *dh)
         unsigned l;
         BN_CTX *ctx;
         BN_MONT_CTX *mont = NULL;
-        BIGNUM *pub_key = dh->pub_key, *priv_key = dh->priv_key, *two = NULL;
+        BIGNUM *pub_key = dh->pub_key, *priv_key = dh->priv_key;
 
         if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
                 DHerror(DH_R_MODULUS_TOO_LARGE);
@@ -137,12 +137,10 @@ generate_key(DH *dh)
 
         if (generate_new_key) {
                 if (dh->q) {
-                        if ((two = BN_new()) == NULL)
-                                goto err;
-                        if (!BN_add(two, BN_value_one(), BN_value_one()))
-                                goto err;
-                        if (!bn_rand_interval(priv_key, two, dh->q))
-                                goto err;
+                        do {
+                                if (!BN_rand_range(priv_key, dh->q))
+                                        goto err;
+                        } while (BN_is_zero(priv_key) || BN_is_one(priv_key));
                 } else {
                         /* secret exponent length */
                         l = dh->length ? dh->length : BN_num_bits(dh->p) - 1;
@@ -167,7 +165,6 @@ generate_key(DH *dh)
         if (dh->priv_key == NULL)
                 BN_free(priv_key);
         BN_CTX_free(ctx);
-        BN_free(two);
         return ok;
 }