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 checks of EVP_PKEY_public_check 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/18424)

(cherry picked from commit bba14c6e28)
This commit is contained in:
Peiwei Hu 2022-05-28 23:56:02 +08:00 committed by Todd Short
parent 3bc9d67a4f
commit 1f4d3ea561
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/evp_pkey_provided_test.c
View File

@ -397,7 +397,7 @@ static int test_fromdata_rsa(void)
goto err;
if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_public_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_private_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
goto err;
@ -661,7 +661,7 @@ static int test_fromdata_dh_named_group(void)
goto err;
if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_public_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_private_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
goto err;
@ -842,7 +842,7 @@ static int test_fromdata_dh_fips186_4(void)
goto err;
if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_public_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_private_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
goto err;
@ -1113,7 +1113,7 @@ static int test_fromdata_ecx(int tst)
goto err;
} else {
/* The private key check should fail if there is only a public key */
if (!TEST_true(EVP_PKEY_public_check(ctx2))
if (!TEST_int_gt(EVP_PKEY_public_check(ctx2), 0)
|| !TEST_false(EVP_PKEY_private_check(ctx2))
|| !TEST_int_le(EVP_PKEY_check(ctx2), 0))
goto err;
@ -1607,7 +1607,7 @@ static int test_fromdata_dsa_fips186_4(void)
goto err;
if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_public_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_public_check(key_ctx), 0)
|| !TEST_true(EVP_PKEY_private_check(key_ctx))
|| !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0))
goto err;
@ -1661,7 +1661,7 @@ static int test_check_dsa(void)
if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(NULL, "DSA", NULL))
|| !TEST_int_le(EVP_PKEY_check(ctx), 0)
|| !TEST_false(EVP_PKEY_public_check(ctx))
|| !TEST_int_le(EVP_PKEY_public_check(ctx), 0)
|| !TEST_false(EVP_PKEY_private_check(ctx))
|| !TEST_int_le(EVP_PKEY_pairwise_check(ctx), 0))
goto err;