diff options
| author | Rod Vagg <rod@vagg.org> | 2018-06-12 22:12:22 +1000 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2018-06-15 16:05:01 +1000 |
| commit | 772d390746eb6e0ebe7dc98f4c074147c61ac23f (patch) | |
| tree | 0994627538f2d75a83fc692eea00f914713ff4a5 /deps/openssl | |
| parent | 2749460ddc3315b7292b4cc8c411a8d77fdab341 (diff) | |
| download | android-node-v8-772d390746eb6e0ebe7dc98f4c074147c61ac23f.tar.gz android-node-v8-772d390746eb6e0ebe7dc98f4c074147c61ac23f.tar.bz2 android-node-v8-772d390746eb6e0ebe7dc98f4c074147c61ac23f.zip | |
deps: float ea7abee from openssl / CVE-2018-0732
Pending OpenSSL 1.1.0i release.
PR-URL: https://github.com/nodejs/node/pull/21282
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Upstream: https://github.com/openssl/openssl/commit/ea7abee
Original commit message:
Reject excessively large primes in DH key generation.
CVE-2018-0732
Signed-off-by: Guido Vranken <guidovranken@gmail.com>
(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe)
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6457)
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/openssl/crypto/dh/dh_key.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/dh/dh_key.c b/deps/openssl/openssl/crypto/dh/dh_key.c index fce9ff47f3..58003d7087 100644 --- a/deps/openssl/openssl/crypto/dh/dh_key.c +++ b/deps/openssl/openssl/crypto/dh/dh_key.c @@ -78,10 +78,15 @@ static int generate_key(DH *dh) int ok = 0; int generate_new_key = 0; unsigned l; - BN_CTX *ctx; + BN_CTX *ctx = NULL; BN_MONT_CTX *mont = NULL; BIGNUM *pub_key = NULL, *priv_key = NULL; + if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { + DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); + return 0; + } + ctx = BN_CTX_new(); if (ctx == NULL) goto err; |