Blame openssl-1.1.0-cc-reqs.patch
|
 |
1ff978b |
diff -up openssl-1.1.0f/crypto/rsa/rsa_gen.c.cc-reqs openssl-1.1.0f/crypto/rsa/rsa_gen.c
|
|
|
1ff978b |
--- openssl-1.1.0f/crypto/rsa/rsa_gen.c.cc-reqs 2017-05-25 14:46:19.000000000 +0200
|
|
|
1ff978b |
+++ openssl-1.1.0f/crypto/rsa/rsa_gen.c 2017-06-02 14:13:45.352475862 +0200
|
|
|
1ff978b |
@@ -85,6 +85,12 @@ static int rsa_builtin_keygen(RSA *rsa,
|
|
|
510bcc2 |
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
|
|
|
a1fb602 |
goto err;
|
|
|
a1fb602 |
|
|
|
a1fb602 |
+ /* prepare minimum p and q difference */
|
|
|
a1fb602 |
+ if (!BN_one(r3))
|
|
|
a1fb602 |
+ goto err;
|
|
|
a1fb602 |
+ if (bitsp > 100 && !BN_lshift(r3, r3, bitsp - 100))
|
|
|
a1fb602 |
+ goto err;
|
|
|
a1fb602 |
+
|
|
|
c144665 |
if (BN_copy(rsa->e, e_value) == NULL)
|
|
|
c144665 |
goto err;
|
|
|
a1fb602 |
|
|
|
1ff978b |
@@ -107,7 +113,9 @@ static int rsa_builtin_keygen(RSA *rsa,
|
|
|
a1fb602 |
do {
|
|
|
a1fb602 |
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
|
|
a1fb602 |
goto err;
|
|
|
1ff978b |
- } while (BN_cmp(rsa->p, rsa->q) == 0);
|
|
|
a1fb602 |
+ if (!BN_sub(r2, rsa->q, rsa->p))
|
|
|
a1fb602 |
+ goto err;
|
|
|
1ff978b |
+ } while (BN_ucmp(r2, r3) <= 0);
|
|
|
1ff978b |
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
|
1ff978b |
goto err;
|
|
|
1ff978b |
if (!BN_gcd(r1, r2, rsa->e, ctx))
|