Commit edea42c6 authored by Paul Yang's avatar Paul Yang Committed by Bernd Edlinger
Browse files

Change to check last return value of BN_CTX_get 



To make it consistent in the code base

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/3749)
parent 9e1d5e8d

crypto/bn/bn_div.c

+3 −6
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -191,14 +191,11 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor, 
    }



    BN_CTX_start(ctx);

    res = (dv == NULL) ? BN_CTX_get(ctx) : dv;

    tmp = BN_CTX_get(ctx);

    snum = BN_CTX_get(ctx);

    sdiv = BN_CTX_get(ctx);

    if (dv == NULL)

        res = BN_CTX_get(ctx);

    else

        res = dv;

    if (sdiv == NULL || res == NULL || tmp == NULL || snum == NULL)

    if (sdiv == NULL)

        goto err;



    /* First we normalise the numbers */

crypto/bn/bn_exp.c

+8 −12
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -50,10 +50,7 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) 
    }



    BN_CTX_start(ctx);

    if ((r == a) || (r == p))

        rr = BN_CTX_get(ctx);

    else

        rr = r;

    rr = ((r == a) || (r == p)) ? BN_CTX_get(ctx) : r;

    v = BN_CTX_get(ctx);

    if (rr == NULL || v == NULL)

        goto err;
@@ -85,7 +82,7 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) 
 err:

    BN_CTX_end(ctx);

    bn_check_top(r);

    return (ret);

    return ret;

}



int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
@@ -189,7 +186,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 
    BN_CTX_start(ctx);

    aa = BN_CTX_get(ctx);

    val[0] = BN_CTX_get(ctx);

    if (!aa || !val[0])

    if (val[0] == NULL)

        goto err;



    BN_RECP_CTX_init(&recp);
@@ -330,7 +327,7 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, 
    d = BN_CTX_get(ctx);

    r = BN_CTX_get(ctx);

    val[0] = BN_CTX_get(ctx);

    if (!d || !r || !val[0])

    if (val[0] == NULL)

        goto err;



    /*
@@ -1095,7 +1092,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, 
    int b, bits, ret = 0;

    int r_is_one;

    BN_ULONG w, next_w;

    BIGNUM *d, *r, *t;

    BIGNUM *r, *t;

    BIGNUM *swap_tmp;

#define BN_MOD_MUL_WORD(r, w, m) \

                (BN_mul_word(r, (w)) && \
@@ -1148,10 +1145,9 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, 
    }



    BN_CTX_start(ctx);

    d = BN_CTX_get(ctx);

    r = BN_CTX_get(ctx);

    t = BN_CTX_get(ctx);

    if (d == NULL || r == NULL || t == NULL)

    if (t == NULL)

        goto err;



    if (in_mont != NULL)
@@ -1266,7 +1262,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 
    BN_CTX_start(ctx);

    d = BN_CTX_get(ctx);

    val[0] = BN_CTX_get(ctx);

    if (!d || !val[0])

    if (val[0] == NULL)

        goto err;



    if (!BN_nnmod(val[0], a, m, ctx))

crypto/bn/bn_exp2.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -50,7 +50,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1, 
    r = BN_CTX_get(ctx);

    val1[0] = BN_CTX_get(ctx);

    val2[0] = BN_CTX_get(ctx);

    if (!d || !r || !val1[0] || !val2[0])

    if (val2[0] == NULL)

        goto err;



    if (in_mont != NULL)

crypto/bn/bn_gcd.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -23,7 +23,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) 
    BN_CTX_start(ctx);

    a = BN_CTX_get(ctx);

    b = BN_CTX_get(ctx);

    if (a == NULL || b == NULL)

    if (b == NULL)

        goto err;



    if (BN_copy(a, in_a) == NULL)

crypto/bn/bn_gf2m.c

+6 −8
Original line number Diff line number Diff line 
/*

 * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved

 *

 * Licensed under the OpenSSL license (the "License").  You may not use
@@ -557,13 +557,11 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) 


    BN_CTX_start(ctx);



    if ((b = BN_CTX_get(ctx)) == NULL)

        goto err;

    if ((c = BN_CTX_get(ctx)) == NULL)

        goto err;

    if ((u = BN_CTX_get(ctx)) == NULL)

        goto err;

    if ((v = BN_CTX_get(ctx)) == NULL)

    b = BN_CTX_get(ctx);

    c = BN_CTX_get(ctx);

    u = BN_CTX_get(ctx);

    v = BN_CTX_get(ctx);

    if (v == NULL)

        goto err;



    if (!BN_GF2m_mod(u, a, p))