Fixed efficiency pre-test on RSA prime generation (no security issue, but RSA key generation with pubexp 5, 7 or 11 may be slightly more efficient).

pornin · pornin · commit 9721b3e75666 · 2019-04-17T17:52:29.000+02:00
diff --git a/src/rsa/rsa_i15_keygen.c b/src/rsa/rsa_i15_keygen.c
@@ -318,9 +318,9 @@ mkprime(const br_prng_class **rng, uint16_t *x, uint32_t esize,
 			continue;
 		}
 		if ((pubexp == 3 && m3 == 1)
-			|| (pubexp == 5 && m5 == 5)
-			|| (pubexp == 7 && m5 == 7)
-			|| (pubexp == 11 && m5 == 11))
+			|| (pubexp == 5 && m5 == 1)
+			|| (pubexp == 7 && m7 == 1)
+			|| (pubexp == 11 && m11 == 1))
 		{
 			continue;
 		}
diff --git a/src/rsa/rsa_i31_keygen_inner.c b/src/rsa/rsa_i31_keygen_inner.c
@@ -340,9 +340,9 @@ mkprime(const br_prng_class **rng, uint32_t *x, uint32_t esize,
 			continue;
 		}
 		if ((pubexp == 3 && m3 == 1)
-			|| (pubexp == 5 && m5 == 5)
-			|| (pubexp == 7 && m5 == 7)
-			|| (pubexp == 11 && m5 == 11))
+			|| (pubexp == 5 && m5 == 1)
+			|| (pubexp == 7 && m7 == 1)
+			|| (pubexp == 11 && m11 == 1))
 		{
 			continue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -318,9 +318,9 @@ mkprime(const br_prng_class *rng, uint16_t x, uint32_t esize,`
`318`	`318`	`continue;`
`319`	`319`	`}`
`320`	`320`	`if ((pubexp == 3 && m3 == 1)`
`321`		`- \|\| (pubexp == 5 && m5 == 5)`
`322`		`- \|\| (pubexp == 7 && m5 == 7)`
`323`		`- \|\| (pubexp == 11 && m5 == 11))`
	`321`	`+ \|\| (pubexp == 5 && m5 == 1)`
	`322`	`+ \|\| (pubexp == 7 && m7 == 1)`
	`323`	`+ \|\| (pubexp == 11 && m11 == 1))`
`324`	`324`	`{`
`325`	`325`	`continue;`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,9 +340,9 @@ mkprime(const br_prng_class *rng, uint32_t x, uint32_t esize,`
`340`	`340`	`continue;`
`341`	`341`	`}`
`342`	`342`	`if ((pubexp == 3 && m3 == 1)`
`343`		`- \|\| (pubexp == 5 && m5 == 5)`
`344`		`- \|\| (pubexp == 7 && m5 == 7)`
`345`		`- \|\| (pubexp == 11 && m5 == 11))`
	`343`	`+ \|\| (pubexp == 5 && m5 == 1)`
	`344`	`+ \|\| (pubexp == 7 && m7 == 1)`
	`345`	`+ \|\| (pubexp == 11 && m11 == 1))`
`346`	`346`	`{`
`347`	`347`	`continue;`
`348`	`348`	`}`