From: Felix Laurie von Massenbach <felix@erbridge.co.uk>
Date: Tue, 27 May 2014 12:23:21 +0000 (+0100)
Subject: Refactor the first prime index.
X-Git-Tag: master-pre-reformat~705^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c74e1487765896c528bd19f44eb298632156d41d;p=openssl

Refactor the first prime index.
---

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index 064944c8dd..117dda955b 100644
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -172,6 +172,7 @@ static int prime_offsets[480] = {
 	2297, 2309, 2311 };
 static int prime_offset_count = 480;
 static int prime_multiplier = 2310;
+static int first_prime_index = 5;
 
 int BN_GENCB_call(BN_GENCB *cb, int a, int b)
 	{
@@ -420,7 +421,6 @@ loop:
 		/* check that rnd is a prime */
 		if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1)
 			{
-			/*if (!BN_add(rnd, rnd, add)) goto err;*/
 			goto loop;
 			}
 		}
@@ -456,8 +456,8 @@ loop:
 
 	/* we now have a random number 'rand' to test. */
 
-	/* skip primes 2, 3, 5, 7, 11 */
-	for (i = 5; i < NUMPRIMES; i++)
+	/* skip coprimes */
+	for (i = first_prime_index; i < NUMPRIMES; i++)
 		{
 		/* check that rnd is a prime */
 		if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1)