diff options
| author | Peiwei Hu <jlu.hpw@foxmail.com> | 2022-05-28 23:56:02 +0800 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2022-06-02 10:36:56 -0400 |
| commit | bba14c6e28e9519b2d40fc5c551893996f2db246 (patch) | |
| tree | 47583303dca6e92d2e0a4bb822857fe1c94b18c4 /test/evp_pkey_provided_test.c | |
| parent | d016758706d0a7a104ff09db94448aeec1b38193 (diff) | |
| download | openssl-new-bba14c6e28e9519b2d40fc5c551893996f2db246.tar.gz | |
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)
Diffstat (limited to 'test/evp_pkey_provided_test.c')
| -rw-r--r-- | test/evp_pkey_provided_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 563e0ad2ed..3e2e78ed03 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -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; |