97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
|
|
index c7f1dc3..aa8a7c0 100644
|
|
--- a/crypto/rsa/rsa_gen.c
|
|
+++ b/crypto/rsa/rsa_gen.c
|
|
@@ -177,6 +177,17 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
|
BIGNUM *pr0, *d, *p;
|
|
int bitsp, bitsq, ok = -1, n = 0;
|
|
BN_CTX *ctx = NULL;
|
|
+ unsigned long error = 0;
|
|
+
|
|
+ /*
|
|
+ * When generating ridiculously small keys, we can get stuck
|
|
+ * continually regenerating the same prime values.
|
|
+ */
|
|
+ if (bits < 16) {
|
|
+ ok = 0; /* we set our own err */
|
|
+ RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
|
+ goto err;
|
|
+ }
|
|
|
|
#ifdef OPENSSL_FIPS
|
|
if (FIPS_module_mode()) {
|
|
@@ -233,45 +244,55 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
|
if (BN_copy(rsa->e, e_value) == NULL)
|
|
goto err;
|
|
|
|
+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
|
|
+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
|
|
+ BN_set_flags(r2, BN_FLG_CONSTTIME);
|
|
/* generate p and q */
|
|
for (;;) {
|
|
if (!BN_generate_prime_ex(rsa->p, bitsp, 0, NULL, NULL, cb))
|
|
goto err;
|
|
if (!BN_sub(r2, rsa->p, BN_value_one()))
|
|
goto err;
|
|
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
- goto err;
|
|
- if (BN_is_one(r1))
|
|
+ ERR_set_mark();
|
|
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
+ /* GCD == 1 since inverse exists */
|
|
break;
|
|
+ }
|
|
+ error = ERR_peek_last_error();
|
|
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
+ /* GCD != 1 */
|
|
+ ERR_pop_to_mark();
|
|
+ } else {
|
|
+ goto err;
|
|
+ }
|
|
if (!BN_GENCB_call(cb, 2, n++))
|
|
goto err;
|
|
}
|
|
if (!BN_GENCB_call(cb, 3, 0))
|
|
goto err;
|
|
for (;;) {
|
|
- /*
|
|
- * When generating ridiculously small keys, we can get stuck
|
|
- * continually regenerating the same prime values. Check for this and
|
|
- * bail if it happens 3 times.
|
|
- */
|
|
- unsigned int degenerate = 0;
|
|
do {
|
|
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
|
goto err;
|
|
if (!BN_sub(r2, rsa->q, rsa->p))
|
|
goto err;
|
|
- } while ((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
|
|
- if (degenerate == 3) {
|
|
- ok = 0; /* we set our own err */
|
|
- RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
|
- goto err;
|
|
- }
|
|
+ } while (BN_ucmp(r2, r3) <= 0);
|
|
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
goto err;
|
|
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
- goto err;
|
|
- if (BN_is_one(r1))
|
|
+ ERR_set_mark();
|
|
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
+ /* GCD == 1 since inverse exists */
|
|
break;
|
|
+ }
|
|
+ error = ERR_peek_last_error();
|
|
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
+ /* GCD != 1 */
|
|
+ ERR_pop_to_mark();
|
|
+ } else {
|
|
+ goto err;
|
|
+ }
|
|
if (!BN_GENCB_call(cb, 2, n++))
|
|
goto err;
|
|
}
|