2018-05-29 21:06:35 +00:00
|
|
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
|
|
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
|
|
|
@@ -86,6 +86,12 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
2018-01-19 08:36:03 +00:00
|
|
|
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
+ /* prepare minimum p and q difference */
|
|
|
|
+ if (!BN_one(r3))
|
|
|
|
+ goto err;
|
|
|
|
+ if (bitsp > 100 && !BN_lshift(r3, r3, bitsp - 100))
|
|
|
|
+ goto err;
|
|
|
|
+
|
|
|
|
if (BN_copy(rsa->e, e_value) == NULL)
|
|
|
|
goto err;
|
|
|
|
|
2018-05-29 21:06:35 +00:00
|
|
|
@@ -118,7 +124,9 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
2018-01-19 08:36:03 +00:00
|
|
|
do {
|
|
|
|
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
|
|
|
goto err;
|
2018-05-29 21:06:35 +00:00
|
|
|
- } while (BN_cmp(rsa->p, rsa->q) == 0);
|
2018-01-19 08:36:03 +00:00
|
|
|
+ if (!BN_sub(r2, rsa->q, rsa->p))
|
|
|
|
+ goto err;
|
2018-05-29 21:06:35 +00:00
|
|
|
+ } while (BN_ucmp(r2, r3) <= 0);
|
|
|
|
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
|
|
goto err;
|
|
|
|
ERR_set_mark();
|
|
|
|
--
|
|
|
|
2.17.0
|
|
|
|
|