deps: float ea7abee from openssl / CVE-2018-0732

Pending OpenSSL 1.1.0i release. PR-URL: #21282 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Upstream: openssl/openssl@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 openssl/openssl#6457)
nodejs · Jun 12, 2018 · e4a7e0d28bc0db3bf27afeef98f96b6a9f86d4ed · e4a7e0d
1 parent e1b571d
commit e4a7e0d28bc0db3bf27afeef98f96b6a9f86d4ed
Unified Split

Showing with 6 additions and 1 deletion.

+6 −1 deps/openssl/openssl/crypto/dh/dh_key.c
diff --git 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;