From d016758706d0a7a104ff09db94448aeec1b38193 Mon Sep 17 00:00:00 2001 From: Peiwei Hu Date: Sat, 28 May 2022 23:53:19 +0800 Subject: Fix the checks of EVP_PKEY_pairwise_check Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale Reviewed-by: Todd Short (Merged from https://github.com/openssl/openssl/pull/18424) --- test/evp_pkey_provided_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/evp_pkey_provided_test.c') diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 7af5796113..563e0ad2ed 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -399,7 +399,7 @@ static int test_fromdata_rsa(void) if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0) || !TEST_true(EVP_PKEY_public_check(key_ctx)) || !TEST_true(EVP_PKEY_private_check(key_ctx)) - || !TEST_true(EVP_PKEY_pairwise_check(key_ctx))) + || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0)) goto err; /* EVP_PKEY_copy_parameters() should fail for RSA */ @@ -663,7 +663,7 @@ static int test_fromdata_dh_named_group(void) if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0) || !TEST_true(EVP_PKEY_public_check(key_ctx)) || !TEST_true(EVP_PKEY_private_check(key_ctx)) - || !TEST_true(EVP_PKEY_pairwise_check(key_ctx))) + || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0)) goto err; EVP_PKEY_CTX_free(key_ctx); key_ctx = NULL; @@ -844,7 +844,7 @@ static int test_fromdata_dh_fips186_4(void) if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0) || !TEST_true(EVP_PKEY_public_check(key_ctx)) || !TEST_true(EVP_PKEY_private_check(key_ctx)) - || !TEST_true(EVP_PKEY_pairwise_check(key_ctx))) + || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0)) goto err; EVP_PKEY_CTX_free(key_ctx); key_ctx = NULL; @@ -1609,7 +1609,7 @@ static int test_fromdata_dsa_fips186_4(void) if (!TEST_int_gt(EVP_PKEY_check(key_ctx), 0) || !TEST_true(EVP_PKEY_public_check(key_ctx)) || !TEST_true(EVP_PKEY_private_check(key_ctx)) - || !TEST_true(EVP_PKEY_pairwise_check(key_ctx))) + || !TEST_int_gt(EVP_PKEY_pairwise_check(key_ctx), 0)) goto err; EVP_PKEY_CTX_free(key_ctx); key_ctx = NULL; @@ -1663,7 +1663,7 @@ static int test_check_dsa(void) || !TEST_int_le(EVP_PKEY_check(ctx), 0) || !TEST_false(EVP_PKEY_public_check(ctx)) || !TEST_false(EVP_PKEY_private_check(ctx)) - || !TEST_false(EVP_PKEY_pairwise_check(ctx))) + || !TEST_int_le(EVP_PKEY_pairwise_check(ctx), 0)) goto err; ret = 1; -- cgit v1.2.1