Commit 26a39fa9 authored by Rich Salz's avatar Rich Salz
Browse files

Avoid over-long strings. Fix a mem leak. 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2299)
parent 9cf847d7

test/bntest.c

+64 −34
Original line number Diff line number Diff line
@@ -291,6 +291,62 @@ static int test_mod() 
    return 1;

}



static const char *bn1strings[] = {

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF00",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF",

    NULL

};



static const char *bn2strings[] = {

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",

    "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF0000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "0000000000000000000000000000000000000000000000000000000000000000",

    "000000000000000000000000000000000000000000FFFFFFFFFFFFFF00000000",

    NULL

};



static char *glue(const char *list[])

{

    size_t len = 0;

    char *p, *save;

    int i;



    for (i = 0; list[i] != NULL; i++)

        len += strlen(list[i]);

    p = save = OPENSSL_malloc(len + 1);

    if (p != NULL) {

        for (i = 0; list[i] != NULL; i++)

            p += strlen(strcpy(p, list[i]));

    }

    return save;

}



/*

 * Test constant-time modular exponentiation with 1024-bit inputs, which on

 * x86_64 cause a different code branch to be taken.
@@ -299,6 +355,7 @@ static int test_modexp_mont5() 
{

    BIGNUM *a, *p, *m, *d, *e, *b, *n, *c;

    BN_MONT_CTX *mont;

    char *bigstring;



    a = BN_new();

    p = BN_new();
@@ -347,40 +404,13 @@ static int test_modexp_mont5() 
    }



    /* Regression test for carry bug in sqr[x]8x_mont */

    BN_hex2bn(&n,

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF00"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF");

    BN_hex2bn(&a,

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"

        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF0000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "0000000000000000000000000000000000000000000000000000000000000000"

        "000000000000000000000000000000000000000000FFFFFFFFFFFFFF00000000");

    bigstring = glue(bn1strings);

    BN_hex2bn(&n, bigstring);

    OPENSSL_free(bigstring);

    bigstring = glue(bn2strings);

    BN_hex2bn(&a, bigstring);

    OPENSSL_free(bigstring);

    BN_free(b);

    b = BN_dup(a);

    BN_MONT_CTX_set(mont, n, ctx);

    BN_mod_mul_montgomery(c, a, a, mont, ctx);