Commit 5419dadd authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Fix possible crash in X931 code. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3675)
parent 5625567f

crypto/bn/bn_x931p.c

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

crypto/rsa/rsa_x931g.c

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