6a450b
diff -up openssl-1.0.1e/crypto/rsa/rsa_gen.c.cc-reqs openssl-1.0.1e/crypto/rsa/rsa_gen.c
6a450b
--- openssl-1.0.1e/crypto/rsa/rsa_gen.c.cc-reqs	2015-01-13 12:45:51.000000000 +0100
6a450b
+++ openssl-1.0.1e/crypto/rsa/rsa_gen.c	2015-01-15 17:35:04.649697922 +0100
6a450b
@@ -438,6 +438,10 @@ static int rsa_builtin_keygen(RSA *rsa,
6a450b
 	if(!rsa->dmq1 && ((rsa->dmq1=BN_new()) == NULL)) goto err;
6a450b
 	if(!rsa->iqmp && ((rsa->iqmp=BN_new()) == NULL)) goto err;
6a450b
 
6a450b
+	/* prepare minimum p and q difference */
6a450b
+	if (!BN_one(r3)) goto err;
6a450b
+	if (bitsp > 100 && !BN_lshift(r3, r3, bitsp - 100)) goto err;
6a450b
+
6a450b
 	BN_copy(rsa->e, e_value);
6a450b
 
6a450b
 	/* generate p and q */
6a450b
@@ -463,7 +467,9 @@ static int rsa_builtin_keygen(RSA *rsa,
6a450b
 			{
6a450b
 			if(!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
6a450b
 				goto err;
6a450b
-			} while((BN_cmp(rsa->p, rsa->q) == 0) && (++degenerate < 3));
6a450b
+	       		if (!BN_sub(r2, rsa->q, rsa->p))
6a450b
+				goto err;
6a450b
+			} while((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
6a450b
 		if(degenerate == 3)
6a450b
 			{
6a450b
 			ok = 0; /* we set our own err */