diff options
| author | Samuel Weiser <samuel.weiser@iaik.tugraz.at> | 2018-01-31 13:10:55 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-21 17:36:40 +0000 |
| commit | 011f82e66f4bf131c733fd41a8390039859aafb2 (patch) | |
| tree | 643782a27ec2fcd35a7f86b2ea85351d4a023292 | |
| parent | 9db724cfede4ba7a3668bff533973ee70145ec07 (diff) | |
used ERR set/pop mark
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5170)
| -rw-r--r-- | crypto/rsa/rsa_gen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index a287ed7385..f869f19150 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -96,6 +96,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, goto err; if (!BN_sub(r2, rsa->p, BN_value_one())) goto err; + ERR_set_mark(); if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) { /* GCD == 1 since inverse exists */ break; @@ -104,7 +105,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, if (ERR_GET_LIB(error) == ERR_LIB_BN && ERR_GET_REASON(error) == BN_R_NO_INVERSE) { /* GCD != 1 */ - ERR_clear_error(); + ERR_pop_to_mark(); } else { goto err; } @@ -120,6 +121,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, } while (BN_cmp(rsa->p, rsa->q) == 0); if (!BN_sub(r2, rsa->q, BN_value_one())) goto err; + ERR_set_mark(); if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) { /* GCD == 1 since inverse exists */ break; @@ -128,7 +130,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, if (ERR_GET_LIB(error) == ERR_LIB_BN && ERR_GET_REASON(error) == BN_R_NO_INVERSE) { /* GCD != 1 */ - ERR_clear_error(); + ERR_pop_to_mark(); } else { goto err; } |