Commit 91f7361f authored by Guido Vranken's avatar Guido Vranken Committed by Matt Caswell
Browse files

Reject excessively large primes in DH key generation. 



CVE-2018-0732

Signed-off-by: default avatarGuido Vranken <guidovranken@gmail.com>

Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6457)
parent a21180b7

crypto/dh/dh_key.c

+6 −1
Original line number Diff line number Diff line
@@ -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;