|
 |
bbd2dd |
diff -up openssl-1.0.2k/crypto/rsa/rsa_gen.c.gen-timing openssl-1.0.2k/crypto/rsa/rsa_gen.c
|
|
|
bbd2dd |
--- openssl-1.0.2k/crypto/rsa/rsa_gen.c.gen-timing 2018-06-18 13:46:24.323138691 +0200
|
|
|
bbd2dd |
+++ openssl-1.0.2k/crypto/rsa/rsa_gen.c 2018-06-18 14:53:26.361975922 +0200
|
|
|
bbd2dd |
@@ -1,6 +1,6 @@
|
|
|
bbd2dd |
/* crypto/rsa/rsa_gen.c */
|
|
|
bbd2dd |
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
|
bbd2dd |
- * Copyright (C) 2013 Red Hat, Inc.
|
|
|
bbd2dd |
+ * Copyright (C) 2013, 2018 Red Hat, Inc.
|
|
|
bbd2dd |
* All rights reserved.
|
|
|
bbd2dd |
*
|
|
|
bbd2dd |
* This package is an SSL implementation written
|
|
|
bbd2dd |
@@ -175,14 +175,13 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
BN_GENCB *cb)
|
|
|
bbd2dd |
{
|
|
|
bbd2dd |
BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL, *tmp;
|
|
|
bbd2dd |
- BIGNUM local_r0, local_d, local_p;
|
|
|
bbd2dd |
- BIGNUM *pr0, *d, *p;
|
|
|
bbd2dd |
BN_CTX *ctx = NULL;
|
|
|
bbd2dd |
int ok = -1;
|
|
|
bbd2dd |
int i;
|
|
|
bbd2dd |
int n = 0;
|
|
|
bbd2dd |
int test = 0;
|
|
|
bbd2dd |
int pbits = bits / 2;
|
|
|
bbd2dd |
+ unsigned long error = 0;
|
|
|
bbd2dd |
|
|
|
bbd2dd |
if (FIPS_selftest_failed()) {
|
|
|
bbd2dd |
FIPSerr(FIPS_F_RSA_BUILTIN_KEYGEN, FIPS_R_FIPS_SELFTEST_FAILED);
|
|
|
bbd2dd |
@@ -251,6 +250,12 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
if (!BN_is_zero(rsa->p) && !BN_is_zero(rsa->q))
|
|
|
bbd2dd |
test = 1;
|
|
|
bbd2dd |
|
|
|
bbd2dd |
+ BN_set_flags(r0, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(r1, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(r2, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+
|
|
|
bbd2dd |
retry:
|
|
|
bbd2dd |
/* generate p and q */
|
|
|
bbd2dd |
for (i = 0; i < 5 * pbits; i++) {
|
|
|
bbd2dd |
@@ -266,9 +271,9 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->p, BN_value_one()))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- if (BN_is_one(r1)) {
|
|
|
bbd2dd |
+ ERR_set_mark();
|
|
|
bbd2dd |
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
|
bbd2dd |
+ /* GCD == 1 since inverse exists */
|
|
|
bbd2dd |
int r;
|
|
|
bbd2dd |
r = BN_is_prime_fasttest_ex(rsa->p, pbits > 1024 ? 4 : 5, ctx, 0,
|
|
|
bbd2dd |
cb);
|
|
|
bbd2dd |
@@ -276,8 +281,16 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
if (r > 0)
|
|
|
bbd2dd |
break;
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ error = ERR_peek_last_error();
|
|
|
bbd2dd |
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
|
bbd2dd |
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
|
bbd2dd |
+ /* GCD != 1 */
|
|
|
bbd2dd |
+ ERR_pop_to_mark();
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
}
|
|
|
bbd2dd |
-
|
|
|
bbd2dd |
if (!BN_GENCB_call(cb, 2, n++))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
}
|
|
|
bbd2dd |
@@ -309,9 +322,9 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- if (BN_is_one(r1)) {
|
|
|
bbd2dd |
+ ERR_set_mark();
|
|
|
bbd2dd |
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
|
bbd2dd |
+ /* GCD == 1 since inverse exists */
|
|
|
bbd2dd |
int r;
|
|
|
bbd2dd |
r = BN_is_prime_fasttest_ex(rsa->q, pbits > 1024 ? 4 : 5, ctx, 0,
|
|
|
bbd2dd |
cb);
|
|
|
bbd2dd |
@@ -319,8 +332,16 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
if (r > 0)
|
|
|
bbd2dd |
break;
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ error = ERR_peek_last_error();
|
|
|
bbd2dd |
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
|
bbd2dd |
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
|
bbd2dd |
+ /* GCD != 1 */
|
|
|
bbd2dd |
+ ERR_pop_to_mark();
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
}
|
|
|
bbd2dd |
-
|
|
|
bbd2dd |
if (!BN_GENCB_call(cb, 2, n++))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
}
|
|
|
bbd2dd |
@@ -355,51 +376,44 @@ static int FIPS_rsa_builtin_keygen(RSA *
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
|
bbd2dd |
goto err; /* q-1 */
|
|
|
bbd2dd |
|
|
|
bbd2dd |
+ /* note that computing gcd is not safe to timing attacks */
|
|
|
bbd2dd |
if (!BN_gcd(r0, r1, r2, ctx))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
|
|
|
bbd2dd |
- pr0 = &local_r0;
|
|
|
bbd2dd |
- BN_with_flags(pr0, r0, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
- } else
|
|
|
bbd2dd |
- pr0 = r0;
|
|
|
bbd2dd |
- if (!BN_div(r0, NULL, r1, pr0, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- if (!BN_mul(r0, r0, r2, ctx))
|
|
|
bbd2dd |
- goto err; /* lcm(p-1, q-1) */
|
|
|
bbd2dd |
-
|
|
|
bbd2dd |
- if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
|
|
|
bbd2dd |
- pr0 = &local_r0;
|
|
|
bbd2dd |
- BN_with_flags(pr0, r0, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
- } else
|
|
|
bbd2dd |
- pr0 = r0;
|
|
|
bbd2dd |
- if (!BN_mod_inverse(rsa->d, rsa->e, pr0, ctx))
|
|
|
bbd2dd |
- goto err; /* d */
|
|
|
bbd2dd |
+
|
|
|
bbd2dd |
+ {
|
|
|
bbd2dd |
+ if (!BN_div(r0, NULL, r1, r0, ctx))
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+
|
|
|
bbd2dd |
+ if (!BN_mul(r0, r0, r2, ctx)) /* lcm(p-1, q-1) */
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+
|
|
|
bbd2dd |
+ if (!BN_mod_inverse(rsa->d, rsa->e, r0, ctx)) /* d */
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
|
|
|
bbd2dd |
if (BN_num_bits(rsa->d) < pbits)
|
|
|
bbd2dd |
goto retry; /* d is too small */
|
|
|
bbd2dd |
|
|
|
bbd2dd |
- /* set up d for correct BN_FLG_CONSTTIME flag */
|
|
|
bbd2dd |
- if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
|
|
|
bbd2dd |
- d = &local_d;
|
|
|
bbd2dd |
- BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
- } else
|
|
|
bbd2dd |
- d = rsa->d;
|
|
|
bbd2dd |
+ {
|
|
|
bbd2dd |
+ BIGNUM *d = BN_new();
|
|
|
bbd2dd |
|
|
|
bbd2dd |
- /* calculate d mod (p-1) */
|
|
|
bbd2dd |
- if (!BN_mod(rsa->dmp1, d, r1, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
+ if (d == NULL)
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
|
|
|
bbd2dd |
- /* calculate d mod (q-1) */
|
|
|
bbd2dd |
- if (!BN_mod(rsa->dmq1, d, r2, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
+ if (/* calculate d mod (p-1) */
|
|
|
bbd2dd |
+ !BN_mod(rsa->dmp1, d, r1, ctx)
|
|
|
bbd2dd |
+ /* calculate d mod (q-1) */
|
|
|
bbd2dd |
+ || !BN_mod(rsa->dmq1, d, r2, ctx)) {
|
|
|
bbd2dd |
+ BN_free(d);
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
+ /* We MUST free d before any further use of rsa->d */
|
|
|
bbd2dd |
+ BN_free(d);
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
|
|
|
bbd2dd |
/* calculate inverse of q mod p */
|
|
|
bbd2dd |
- if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
|
|
|
bbd2dd |
- p = &local_p;
|
|
|
bbd2dd |
- BN_with_flags(p, rsa->p, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
- } else
|
|
|
bbd2dd |
- p = rsa->p;
|
|
|
bbd2dd |
- if (!BN_mod_inverse(rsa->iqmp, rsa->q, p, ctx))
|
|
|
bbd2dd |
+ if (!BN_mod_inverse(rsa->iqmp, rsa->q, rsa->p, ctx))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
|
|
|
bbd2dd |
if (fips_rsa_pairwise_fail)
|
|
|
bbd2dd |
@@ -431,6 +445,17 @@ static int rsa_builtin_keygen(RSA *rsa,
|
|
|
bbd2dd |
BIGNUM *pr0, *d, *p;
|
|
|
bbd2dd |
int bitsp, bitsq, ok = -1, n = 0;
|
|
|
bbd2dd |
BN_CTX *ctx = NULL;
|
|
|
bbd2dd |
+ unsigned long error = 0;
|
|
|
bbd2dd |
+
|
|
|
bbd2dd |
+ /*
|
|
|
bbd2dd |
+ * When generating ridiculously small keys, we can get stuck
|
|
|
bbd2dd |
+ * continually regenerating the same prime values.
|
|
|
bbd2dd |
+ */
|
|
|
bbd2dd |
+ if (bits < 16) {
|
|
|
bbd2dd |
+ ok = 0; /* we set our own err */
|
|
|
bbd2dd |
+ RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
|
|
|
bbd2dd |
#ifdef OPENSSL_FIPS
|
|
|
bbd2dd |
if (FIPS_module_mode()) {
|
|
|
bbd2dd |
@@ -483,45 +508,55 @@ static int rsa_builtin_keygen(RSA *rsa,
|
|
|
bbd2dd |
if (BN_copy(rsa->e, e_value) == NULL)
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
|
|
|
bbd2dd |
+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
+ BN_set_flags(r2, BN_FLG_CONSTTIME);
|
|
|
bbd2dd |
/* generate p and q */
|
|
|
bbd2dd |
for (;;) {
|
|
|
bbd2dd |
if (!BN_generate_prime_ex(rsa->p, bitsp, 0, NULL, NULL, cb))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->p, BN_value_one()))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- if (BN_is_one(r1))
|
|
|
bbd2dd |
+ ERR_set_mark();
|
|
|
bbd2dd |
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
|
bbd2dd |
+ /* GCD == 1 since inverse exists */
|
|
|
bbd2dd |
break;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
+ error = ERR_peek_last_error();
|
|
|
bbd2dd |
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
|
bbd2dd |
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
|
bbd2dd |
+ /* GCD != 1 */
|
|
|
bbd2dd |
+ ERR_pop_to_mark();
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
if (!BN_GENCB_call(cb, 2, n++))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
}
|
|
|
bbd2dd |
if (!BN_GENCB_call(cb, 3, 0))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
for (;;) {
|
|
|
bbd2dd |
- /*
|
|
|
bbd2dd |
- * When generating ridiculously small keys, we can get stuck
|
|
|
bbd2dd |
- * continually regenerating the same prime values. Check for this and
|
|
|
bbd2dd |
- * bail if it happens 3 times.
|
|
|
bbd2dd |
- */
|
|
|
bbd2dd |
- unsigned int degenerate = 0;
|
|
|
bbd2dd |
do {
|
|
|
bbd2dd |
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->q, rsa->p))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- } while ((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
|
|
|
bbd2dd |
- if (degenerate == 3) {
|
|
|
bbd2dd |
- ok = 0; /* we set our own err */
|
|
|
bbd2dd |
- RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- }
|
|
|
bbd2dd |
+ } while (BN_ucmp(r2, r3) <= 0);
|
|
|
bbd2dd |
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
- if (!BN_gcd(r1, r2, rsa->e, ctx))
|
|
|
bbd2dd |
- goto err;
|
|
|
bbd2dd |
- if (BN_is_one(r1))
|
|
|
bbd2dd |
+ ERR_set_mark();
|
|
|
bbd2dd |
+ if (BN_mod_inverse(r1, r2, rsa->e, ctx) != NULL) {
|
|
|
bbd2dd |
+ /* GCD == 1 since inverse exists */
|
|
|
bbd2dd |
break;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
+ error = ERR_peek_last_error();
|
|
|
bbd2dd |
+ if (ERR_GET_LIB(error) == ERR_LIB_BN
|
|
|
bbd2dd |
+ && ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
|
|
|
bbd2dd |
+ /* GCD != 1 */
|
|
|
bbd2dd |
+ ERR_pop_to_mark();
|
|
|
bbd2dd |
+ } else {
|
|
|
bbd2dd |
+ goto err;
|
|
|
bbd2dd |
+ }
|
|
|
bbd2dd |
if (!BN_GENCB_call(cb, 2, n++))
|
|
|
bbd2dd |
goto err;
|
|
|
bbd2dd |
}
|