From 18e45bd9eade832d3ab575f48fcf1f22695939b8 Mon Sep 17 00:00:00 2001 From: Peiwei Hu Date: Fri, 2 Dec 2022 16:33:02 +0800 Subject: Fix the check of EVP_PKEY_decrypt_init Reviewed-by: Hugo Landau Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/19819) (cherry picked from commit b794476df71441a6d30740ab9fadcc0f6d18d3d6) --- crypto/crmf/crmf_lib.c | 2 +- test/evp_extra_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c index 8b42e4392e..3607fb0bf4 100644 --- a/crypto/crmf/crmf_lib.c +++ b/crypto/crmf/crmf_lib.c @@ -648,7 +648,7 @@ X509 cikeysize = EVP_CIPHER_get_key_length(cipher); /* first the symmetric key needs to be decrypted */ 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; size_t failure; int retval; diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index caffdbd53f..3747532ff0 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -2040,7 +2040,7 @@ static int test_EVP_SM2(void) sizeof(kMsg)))) goto done; - if (!TEST_true(EVP_PKEY_decrypt_init(cctx))) + if (!TEST_int_gt(EVP_PKEY_decrypt_init(cctx), 0)) goto done; if (!TEST_true(EVP_PKEY_CTX_set_params(cctx, sparams))) -- cgit v1.2.3