From 772d390746eb6e0ebe7dc98f4c074147c61ac23f Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Tue, 12 Jun 2018 22:12:22 +1000 Subject: 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 Reviewed-By: Ben Noordhuis Reviewed-By: Anna Henningsen 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 (cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) Reviewed-by: Tim Hudson Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/6457) --- deps/openssl/openssl/crypto/dh/dh_key.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'deps/openssl/openssl') 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; -- cgit v1.2.3