From 1f9ad4f953fb178137dbcd625da5ee2440b5449d Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Tue, 11 Aug 2020 17:18:31 +1000 Subject: [PATCH] Fix coverity CID #1452775 & #1452772- Dereference before NULL check in evp_lib.c Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/12628) --- crypto/evp/evp_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index c4d41518ef0..676461a51bf 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -638,14 +638,14 @@ const OSSL_PROVIDER *EVP_MD_provider(const EVP_MD *md) int EVP_MD_block_size(const EVP_MD *md) { int ok; - size_t v = md->block_size; + size_t v; OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; if (md == NULL) { EVPerr(EVP_F_EVP_MD_BLOCK_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL); return -1; } - + v = md->block_size; params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_BLOCK_SIZE, &v); ok = evp_do_md_getparams(md, params); @@ -665,14 +665,14 @@ int EVP_MD_pkey_type(const EVP_MD *md) int EVP_MD_size(const EVP_MD *md) { int ok; - size_t v = md->md_size; + size_t v; OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; if (md == NULL) { EVPerr(EVP_F_EVP_MD_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL); return -1; } - + v = md->md_size; params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &v); ok = evp_do_md_getparams(md, params); -- 2.47.2