diff options
| author | Brian Smith <brian@briansmith.org> | 2016-03-25 23:11:04 +0300 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-04-19 02:19:08 +0300 |
| commit | d035730ac7ebb82fbf1895fea50c29048bb6edb2 (patch) | |
| tree | e56505005fa06b932fba1ea93b3f5b15a109b662 /crypto/dh | |
| parent | 51b0d5b1e86590c6e828b11ede90db04916e9ff1 (diff) | |
Make return value of |BN_MONT_CTX_set_locked| int.
This reduces the chance of double-frees.
BUG=10
Change-Id: I11a240e2ea5572effeddc05acb94db08c54a2e0b
Reviewed-on: https://boringssl-review.googlesource.com/7583
Reviewed-by: David Benjamin <davidben@google.com>
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/crypto/dh/dh.c b/crypto/dh/dh.c index aed8720b..a5cf94d9 100644 --- a/crypto/dh/dh.c +++ b/crypto/dh/dh.c @@ -236,7 +236,6 @@ int DH_generate_key(DH *dh) { int generate_new_key = 0; unsigned l; BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; BIGNUM *pub_key = NULL, *priv_key = NULL; BIGNUM local_priv; @@ -269,9 +268,8 @@ int DH_generate_key(DH *dh) { pub_key = dh->pub_key; } - mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, &dh->method_mont_p_lock, - dh->p, ctx); - if (!mont) { + if (!BN_MONT_CTX_set_locked(&dh->method_mont_p, &dh->method_mont_p_lock, + dh->p, ctx)) { goto err; } @@ -293,7 +291,8 @@ int DH_generate_key(DH *dh) { } BN_with_flags(&local_priv, priv_key, BN_FLG_CONSTTIME); - if (!BN_mod_exp_mont(pub_key, dh->g, &local_priv, dh->p, ctx, mont)) { + if (!BN_mod_exp_mont(pub_key, dh->g, &local_priv, dh->p, ctx, + dh->method_mont_p)) { goto err; } @@ -318,7 +317,6 @@ err: int DH_compute_key(unsigned char *out, const BIGNUM *peers_key, DH *dh) { BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; BIGNUM *shared_key; int ret = -1; int check_result; @@ -344,9 +342,8 @@ int DH_compute_key(unsigned char *out, const BIGNUM *peers_key, DH *dh) { goto err; } - mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, &dh->method_mont_p_lock, - dh->p, ctx); - if (!mont) { + if (!BN_MONT_CTX_set_locked(&dh->method_mont_p, &dh->method_mont_p_lock, + dh->p, ctx)) { goto err; } @@ -357,7 +354,7 @@ int DH_compute_key(unsigned char *out, const BIGNUM *peers_key, DH *dh) { BN_with_flags(&local_priv, dh->priv_key, BN_FLG_CONSTTIME); if (!BN_mod_exp_mont(shared_key, peers_key, &local_priv, dh->p, ctx, - mont)) { + dh->method_mont_p)) { OPENSSL_PUT_ERROR(DH, ERR_R_BN_LIB); goto err; } |