diff options
| author |   tb <tb@openbsd.org> | 2018-11-06 02:14:39 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-11-06 02:14:39 +0000 |
| commit | a5fe48f913c5dc8dee121a4d7fe4430ec174ca51 (patch) | |
| tree | 5ee8e3e6372fd54f3de38daca3e364a9918ccb94 /lib/libcrypto/dsa/dsa_ossl.c | |
| parent | Add TLSv1.3 to version regress tests. (diff) | |
| download | wireguard-openbsd-a5fe48f913c5dc8dee121a4d7fe4430ec174ca51.tar.xz wireguard-openbsd-a5fe48f913c5dc8dee121a4d7fe4430ec174ca51.zip | |
revert use of bn_rand_interval due to failures with ECDHE and TLS
Diffstat (limited to 'lib/libcrypto/dsa/dsa_ossl.c')
| -rw-r--r-- | lib/libcrypto/dsa/dsa_ossl.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/libcrypto/dsa/dsa_ossl.c b/lib/libcrypto/dsa/dsa_ossl.c index cda750a0edf..6eb391ddeb6 100644 --- a/lib/libcrypto/dsa/dsa_ossl.c +++ b/lib/libcrypto/dsa/dsa_ossl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ossl.c,v 1.38 2018/11/05 23:54:27 tb Exp $ */ +/* $OpenBSD: dsa_ossl.c,v 1.39 2018/11/06 02:14:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -150,9 +150,13 @@ dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) * * s = inv(k)inv(b)(bm + bxr) mod q * - * Where b is a random value in the range [1, q). + * Where b is a random value in the range [1, q-1]. */ - if (!bn_rand_interval(&b, BN_value_one(), dsa->q)) + if (!BN_sub(&bm, dsa->q, BN_value_one())) + goto err; + if (!BN_rand_range(&b, &bm)) + goto err; + if (!BN_add(&b, &b, BN_value_one())) goto err; if (BN_mod_inverse_ct(&binv, &b, dsa->q, ctx) == NULL) goto err; @@ -238,8 +242,11 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) !BN_set_bit(&m, q_bits)) goto err; - if (!bn_rand_interval(&k, BN_value_one(), dsa->q)) - goto err; + /* Get random k */ + do { + if (!BN_rand_range(&k, dsa->q)) + goto err; + } while (BN_is_zero(&k)); BN_set_flags(&k, BN_FLG_CONSTTIME); |