root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix the check of EVP_PKEY_decrypt_init 

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19819)

(cherry picked from commit b794476df7)
This commit is contained in:
Peiwei Hu 2022-12-02 16:33:02 +08:00 committed by Tomas Mraz
parent 6a858e9f59
commit bdb66dd4c5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/crmf/crmf_lib.c
View File

@ -648,7 +648,7 @@ X509
cikeysize = EVP_CIPHER_get_key_length(cipher); cikeysize = EVP_CIPHER_get_key_length(cipher);
/* first the symmetric key needs to be decrypted */ /* first the symmetric key needs to be decrypted */
pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq); pkctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, propq);
if (pkctx != NULL && EVP_PKEY_decrypt_init(pkctx)) { if (pkctx != NULL && EVP_PKEY_decrypt_init(pkctx) > 0) {
ASN1_BIT_STRING *encKey = ecert->encSymmKey; ASN1_BIT_STRING *encKey = ecert->encSymmKey;
size_t failure; size_t failure;
int retval; int retval;

2
test/evp_extra_test.c
View File

@ -2040,7 +2040,7 @@ static int test_EVP_SM2(void)
sizeof(kMsg)))) sizeof(kMsg))))
goto done; goto done;
if (!TEST_true(EVP_PKEY_decrypt_init(cctx))) if (!TEST_int_gt(EVP_PKEY_decrypt_init(cctx), 0))
goto done; goto done;
if (!TEST_true(EVP_PKEY_CTX_set_params(cctx, sparams))) if (!TEST_true(EVP_PKEY_CTX_set_params(cctx, sparams)))