diff options
| author |   tb <tb@openbsd.org> | 2018-11-05 23:54:27 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-11-05 23:54:27 +0000 |
| commit | 99212bcc5f18753b2ec00e9dd1d2fa2407cb697a (patch) | |
| tree | 56517b4d61c8fa97e18bcc986c230f5a4d33cba7 /lib/libcrypto/dsa/dsa_ossl.c | |
| parent | Introduce bn_rand_interval() that allows specifying an interval [a, b) (diff) | |
| download | wireguard-openbsd-99212bcc5f18753b2ec00e9dd1d2fa2407cb697a.tar.xz wireguard-openbsd-99212bcc5f18753b2ec00e9dd1d2fa2407cb697a.zip | |
Make use of bn_rand_interval() where appropriate.
ok beck jsing
Diffstat (limited to 'lib/libcrypto/dsa/dsa_ossl.c')
| -rw-r--r-- | lib/libcrypto/dsa/dsa_ossl.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/libcrypto/dsa/dsa_ossl.c b/lib/libcrypto/dsa/dsa_ossl.c index c9399573abf..cda750a0edf 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.37 2018/06/14 18:34:50 jsing Exp $ */ +/* $OpenBSD: dsa_ossl.c,v 1.38 2018/11/05 23:54:27 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -150,13 +150,9 @@ 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-1]. + * Where b is a random value in the range [1, 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())) + if (!bn_rand_interval(&b, BN_value_one(), dsa->q)) goto err; if (BN_mod_inverse_ct(&binv, &b, dsa->q, ctx) == NULL) goto err; @@ -242,11 +238,8 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) !BN_set_bit(&m, q_bits)) goto err; - /* Get random k */ - do { - if (!BN_rand_range(&k, dsa->q)) - goto err; - } while (BN_is_zero(&k)); + if (!bn_rand_interval(&k, BN_value_one(), dsa->q)) + goto err; BN_set_flags(&k, BN_FLG_CONSTTIME); |