diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-03-06 09:54:17 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-03-06 09:54:17 -0500 |
| commit | 697958313ba48c8ebc832ab8f9f2b845fb7acfd4 (patch) | |
| tree | dc36d140b8395bb3872627fa15e44073461e909d /crypto/rsa | |
| parent | e498d95454cf58685e659ec8ac5c57131d7f2de7 (diff) | |
| download | openssl-697958313ba48c8ebc832ab8f9f2b845fb7acfd4.zip openssl-697958313ba48c8ebc832ab8f9f2b845fb7acfd4.tar.gz openssl-697958313ba48c8ebc832ab8f9f2b845fb7acfd4.tar.bz2 | |
Fix an endless loop in rsa_builtin_keygen.
And add a test case.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2757)
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_gen.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index 0d1d56b..4ced965 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -43,6 +43,16 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, int bitsp, bitsq, ok = -1, n = 0; BN_CTX *ctx = NULL; + /* + * When generating ridiculously small keys, we can get stuck + * continually regenerating the same prime values. + */ + if (bits < 16) { + ok = 0; /* we set our own err */ + RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL); + goto err; + } + ctx = BN_CTX_new(); if (ctx == NULL) goto err; @@ -94,21 +104,10 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, if (!BN_GENCB_call(cb, 3, 0)) goto err; for (;;) { - /* - * When generating ridiculously small keys, we can get stuck - * continually regenerating the same prime values. Check for this and - * bail if it happens 3 times. - */ - unsigned int degenerate = 0; do { if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb)) goto err; - } while ((BN_cmp(rsa->p, rsa->q) == 0) && (++degenerate < 3)); - if (degenerate == 3) { - ok = 0; /* we set our own err */ - RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL); - goto err; - } + } while (BN_cmp(rsa->p, rsa->q) == 0); if (!BN_sub(r2, rsa->q, BN_value_one())) goto err; if (!BN_gcd(r1, r2, rsa->e, ctx)) |