used ERR set/pop mark
authorSamuel Weiser <samuel.weiser@iaik.tugraz.at>
Wed, 31 Jan 2018 12:10:55 +0000 (13:10 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 21 Mar 2018 17:37:29 +0000 (17:37 +0000)
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)

(cherry picked from commit 011f82e66f4bf131c733fd41a8390039859aafb2)

crypto/rsa/rsa_gen.c

index 8553772..610d82d 100644 (file)
@@ -163,6 +163,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;
@@ -171,7 +172,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;
         }
@@ -187,6 +188,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;
@@ -195,7 +197,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;
         }