Commit 3c97e412 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

bn/bn_mont.c: move boundary condition check closer to caller. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarDavid Benjamin <davidben@google.com>
(Merged from https://github.com/openssl/openssl/pull/6662)
parent e42395e6

crypto/bn/bn_mont.c

+4 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, 
{

    BIGNUM *tmp;

    int ret = 0;

#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD)

    int num = mont->N.top;



#if defined(OPENSSL_BN_ASM_MONT) && defined(MONT_WORD)

    if (num > 1 && a->top == num && b->top == num) {

        if (bn_wexpand(r, num) == NULL)

            return 0;
@@ -43,6 +43,9 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, 
    }

#endif



    if ((a->top + b->top) > 2 * num)

        return 0;



    BN_CTX_start(ctx);

    tmp = BN_CTX_get(ctx);

    if (tmp == NULL)
@@ -95,8 +98,6 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont) 


    /* clear the top words of T */

    i = max - r->top;

    if (i < 0)

        return 0;

    if (i)

        memset(&rp[r->top], 0, sizeof(*rp) * i);