diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-03-19 09:58:09 +1000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-19 07:25:48 +0100 |
| commit | ce1415ed2ce15305356cd028bcf7b9bc688d6d5c (patch) | |
| tree | e9f4d5ed4bbb781d42b09c6a2c9bebd73fe8917f /crypto/dh | |
| parent | 226f2bf191ba8c2b33749ddc80c9ace051bebf80 (diff) | |
Added NULL check to BN_clear() & BN_CTX_end()
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8518)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_check.c | 18 | ||||
| -rw-r--r-- | crypto/dh/dh_gen.c | 6 | ||||
| -rw-r--r-- | crypto/dh/dh_key.c | 6 |
3 files changed, 10 insertions, 20 deletions
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c index 31332cd1f3..cd7f70b672 100644 --- a/crypto/dh/dh_check.c +++ b/crypto/dh/dh_check.c @@ -58,10 +58,8 @@ int DH_check_params(const DH *dh, int *ret) ok = 1; err: - if (ctx != NULL) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ok; } @@ -171,10 +169,8 @@ int DH_check(const DH *dh, int *ret) } ok = 1; err: - if (ctx != NULL) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ok; } @@ -225,9 +221,7 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) ok = 1; err: - if (ctx != NULL) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ok; } diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index 4e4aeb39b2..1e5c7ca2c9 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -122,9 +122,7 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator, ok = 0; } - if (ctx != NULL) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ok; } diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c index 58210fbbfd..4b0b1f3255 100644 --- a/crypto/dh/dh_key.c +++ b/crypto/dh/dh_key.c @@ -205,10 +205,8 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) ret = BN_bn2bin(tmp, key); err: - if (ctx != NULL) { - BN_CTX_end(ctx); - BN_CTX_free(ctx); - } + BN_CTX_end(ctx); + BN_CTX_free(ctx); return ret; } |