diff options
| author | Pauli <pauli@openssl.org> | 2022-01-25 11:47:23 +1100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-02-01 16:17:24 +1100 |
| commit | 43332e405bea83a2d553e0519fdb04170879bc96 (patch) | |
| tree | 13a6c637d2384fe422050010c0afaaf85fb78028 /test/evp_pkey_provided_test.c | |
| parent | 769cd46540b2ec2a2d91ee3886b9e4f9d78e9a51 (diff) | |
test: change pkey kdf dup fail test to a pkey kdf dup success test
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/17572)
Diffstat (limited to 'test/evp_pkey_provided_test.c')
| -rw-r--r-- | test/evp_pkey_provided_test.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index b4a77f8500..ebd09544df 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -1693,11 +1693,10 @@ static OSSL_PARAM *do_construct_hkdf_params(char *digest, char *key, return params; } -/* Test that EVP_PKEY_CTX_dup() fails gracefully for a KDF */ -static int test_evp_pkey_ctx_dup_kdf_fail(void) +static int test_evp_pkey_ctx_dup_kdf(void) { int ret = 0; - size_t len = 0; + size_t len = 0, dlen = 0; EVP_PKEY_CTX *pctx = NULL, *dctx = NULL; OSSL_PARAM *params = NULL; @@ -1708,10 +1707,12 @@ static int test_evp_pkey_ctx_dup_kdf_fail(void) goto err; if (!TEST_int_eq(EVP_PKEY_derive_init_ex(pctx, params), 1)) goto err; - if (!TEST_int_eq(EVP_PKEY_derive(pctx, NULL, &len), 1) - || !TEST_size_t_eq(len, SHA256_DIGEST_LENGTH)) + if (!TEST_ptr(dctx = EVP_PKEY_CTX_dup(pctx))) goto err; - if (!TEST_ptr_null(dctx = EVP_PKEY_CTX_dup(pctx))) + if (!TEST_int_eq(EVP_PKEY_derive(pctx, NULL, &len), 1) + || !TEST_size_t_eq(len, SHA256_DIGEST_LENGTH) + || !TEST_int_eq(EVP_PKEY_derive(dctx, NULL, &dlen), 1) + || !TEST_size_t_eq(dlen, SHA256_DIGEST_LENGTH)) goto err; ret = 1; err: @@ -1731,7 +1732,7 @@ int setup_tests(void) if (!TEST_ptr(datadir = test_get_argument(0))) return 0; - ADD_TEST(test_evp_pkey_ctx_dup_kdf_fail); + ADD_TEST(test_evp_pkey_ctx_dup_kdf); ADD_TEST(test_evp_pkey_get_bn_param_large); ADD_TEST(test_fromdata_rsa); #ifndef OPENSSL_NO_DH |