openssl/openssl-1.1.0-cc-reqs.patch

28 lines
1.0 KiB
Diff
Raw Normal View History

diff -up openssl-1.1.0f/crypto/rsa/rsa_gen.c.cc-reqs openssl-1.1.0f/crypto/rsa/rsa_gen.c
--- openssl-1.1.0f/crypto/rsa/rsa_gen.c.cc-reqs 2017-05-25 14:46:19.000000000 +0200
+++ openssl-1.1.0f/crypto/rsa/rsa_gen.c 2017-06-02 14:13:45.352475862 +0200
@@ -85,6 +85,12 @@ static int rsa_builtin_keygen(RSA *rsa,
2016-10-11 08:31:54 +00:00
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
2015-04-23 11:57:26 +00:00
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;
+
2017-01-26 15:24:24 +00:00
if (BN_copy(rsa->e, e_value) == NULL)
goto err;
2015-04-23 11:57:26 +00:00
@@ -107,7 +113,9 @@ static int rsa_builtin_keygen(RSA *rsa,
2015-04-23 11:57:26 +00:00
do {
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
goto err;
- } while (BN_cmp(rsa->p, rsa->q) == 0);
2015-04-23 11:57:26 +00:00
+ if (!BN_sub(r2, rsa->q, rsa->p))
+ 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))