diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-06-13 22:34:30 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-14 09:35:48 -0400 |
| commit | 5419dadd4bd1f7abbfa23326ca766d2c143f257c (patch) | |
| tree | 49e74479ee37bdb1e82b549facc4f3e5309c6941 | |
| parent | 5625567f9c7daaa2e2689647e10e4c5d7370718f (diff) | |
| download | openssl-5419dadd4bd1f7abbfa23326ca766d2c143f257c.tar.gz | |
Fix possible crash in X931 code.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3675)
| -rw-r--r-- | crypto/bn/bn_x931p.c | 8 | ||||
| -rw-r--r-- | crypto/rsa/rsa_x931g.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c index 40734cb2f6..8bfbcac6a4 100644 --- a/crypto/bn/bn_x931p.c +++ b/crypto/bn/bn_x931p.c @@ -178,6 +178,8 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx) BN_CTX_start(ctx); t = BN_CTX_get(ctx); + if (t == NULL) + goto err; for (i = 0; i < 1000; i++) { if (!BN_rand(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY)) @@ -216,10 +218,12 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, int ret = 0; BN_CTX_start(ctx); - if (!Xp1) + if (Xp1 == NULL) Xp1 = BN_CTX_get(ctx); - if (!Xp2) + if (Xp2 == NULL) Xp2 = BN_CTX_get(ctx); + if (Xp1 == NULL || Xp2 == NULL) + goto error; if (!BN_rand(Xp1, 101, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY)) goto error; diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c index 9dd993fbc0..877ee2219c 100644 --- a/crypto/rsa/rsa_x931g.c +++ b/crypto/rsa/rsa_x931g.c @@ -153,6 +153,8 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_CTX_start(ctx); Xp = BN_CTX_get(ctx); Xq = BN_CTX_get(ctx); + if (Xq == NULL) + goto error; if (!BN_X931_generate_Xpq(Xp, Xq, bits, ctx)) goto error; |