diff options
| author | Pauli <paul.dale@oracle.com> | 2020-03-26 09:28:01 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-03-28 12:27:22 +1000 |
| commit | 6d4e6009d27712a405e1e3a4c33fb8a8566f134a (patch) | |
| tree | 09d94a8c8f8f6f493cc758b6fd704837be82cb8c /test/evp_pkey_provided_test.c | |
| parent | be19d3caf0724b786ecc97ec4207c07cff63c745 (diff) | |
Param build: make structures opaque.
Since this is public, it is best to make the underlying structure opaque.
This means converting from stack allocation to dynamic allocation for all
usages.
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11390)
Diffstat (limited to 'test/evp_pkey_provided_test.c')
| -rw-r--r-- | test/evp_pkey_provided_test.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 5e77a3186a..6ba61c3cda 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -596,7 +596,7 @@ static int test_fromdata_ec(void) int ret = 0; EVP_PKEY_CTX *ctx = NULL; EVP_PKEY *pk = NULL, *copy_pk = NULL; - OSSL_PARAM_BLD bld; + OSSL_PARAM_BLD *bld = OSSL_PARAM_BLD_new(); BIGNUM *ec_priv_bn = NULL; OSSL_PARAM *fromdata_params = NULL; const char *alg = "EC"; @@ -618,22 +618,22 @@ static int test_fromdata_ec(void) 0xdc, 0x4b, 0x4d, 0x35, 0x43, 0xe1, 0x1b, 0xad }; - OSSL_PARAM_BLD_init(&bld); - + if (!TEST_ptr(bld)) + goto err; if (!TEST_ptr(ec_priv_bn = BN_bin2bn(ec_priv_keydata, sizeof(ec_priv_keydata), NULL))) goto err; - if (OSSL_PARAM_BLD_push_utf8_string(&bld, OSSL_PKEY_PARAM_EC_NAME, + if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_EC_NAME, "prime256v1", 0) <= 0) goto err; - if (OSSL_PARAM_BLD_push_octet_string(&bld, OSSL_PKEY_PARAM_PUB_KEY, + if (OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY, ec_pub_keydata, sizeof(ec_pub_keydata)) <= 0) goto err; - if (OSSL_PARAM_BLD_push_BN(&bld, OSSL_PKEY_PARAM_PRIV_KEY, ec_priv_bn) <= 0) + if (OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, ec_priv_bn) <= 0) goto err; - if (!TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(&bld))) + if (!TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld))) goto err; ctx = EVP_PKEY_CTX_new_from_name(NULL, alg, NULL); if (!TEST_ptr(ctx)) @@ -654,7 +654,8 @@ static int test_fromdata_ec(void) && test_print_key_using_serializer(alg, pk); err: BN_free(ec_priv_bn); - OSSL_PARAM_BLD_free(fromdata_params); + OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_BLD_free(bld); EVP_PKEY_free(pk); EVP_PKEY_free(copy_pk); EVP_PKEY_CTX_free(ctx); |