From 3f883c7c835ff577a6df37e238956c5b9016dc93 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Wed, 7 Apr 2021 13:45:19 +1000 Subject: [PATCH] Replace OSSL_PARAM_BLD_free_params() with OSSL_PARAM_free(). Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14785) --- apps/dhparam.c | 2 +- apps/testdsa.h | 2 +- crypto/dh/dh_ameth.c | 2 +- crypto/dsa/dsa_ameth.c | 2 +- crypto/ec/ec_ameth.c | 2 +- crypto/ec/ecx_meth.c | 2 +- crypto/param_build.c | 5 ----- crypto/rsa/rsa_ameth.c | 2 +- crypto/store/store_lib.c | 2 +- doc/man3/EVP_PKEY_fromdata.pod | 2 +- doc/man3/OSSL_PARAM_BLD.pod | 14 +++++-------- include/openssl/param_build.h | 1 - providers/fips/self_test_kats.c | 14 ++++++------- providers/implementations/keymgmt/dh_kmgmt.c | 2 +- providers/implementations/keymgmt/dsa_kmgmt.c | 2 +- providers/implementations/keymgmt/ec_kmgmt.c | 4 ++-- providers/implementations/keymgmt/ecx_kmgmt.c | 2 +- .../keymgmt/mac_legacy_kmgmt.c | 2 +- providers/implementations/keymgmt/rsa_kmgmt.c | 2 +- ssl/statem/statem_clnt.c | 2 +- ssl/t1_lib.c | 2 +- test/acvp_test.c | 10 +++++----- test/ectest.c | 6 +++--- test/endecode_test.c | 8 ++++---- test/evp_extra_test.c | 20 +++++++++---------- test/evp_pkey_provided_test.c | 10 +++++----- test/helpers/predefined_dhparams.c | 2 +- test/param_build_test.c | 8 ++++---- test/sslapitest.c | 2 +- util/libcrypto.num | 1 - 30 files changed, 63 insertions(+), 74 deletions(-) diff --git a/apps/dhparam.c b/apps/dhparam.c index 1cd19fae92..136dbcff64 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -396,7 +396,7 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh) err: EVP_PKEY_CTX_free(ctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); BN_free(bn_p); BN_free(bn_q); diff --git a/apps/testdsa.h b/apps/testdsa.h index 8738335391..d80d2cf7f2 100644 --- a/apps/testdsa.h +++ b/apps/testdsa.h @@ -267,7 +267,7 @@ EVP_PKEY *get_dsa(int dsa_bits) params) <= 0) pkey = NULL; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); BN_free(priv_key); BN_free(pub_key); diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 0ed057dd8d..907a867eca 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -497,7 +497,7 @@ static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata, /* We export, the provider imports */ rv = evp_keymgmt_import(to_keymgmt, to_keydata, selection, params); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return rv; diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 1009f1a5c7..69964c053c 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -474,7 +474,7 @@ static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata, /* We export, the provider imports */ rv = evp_keymgmt_import(to_keymgmt, to_keydata, selection, params); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return rv; diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 273663d89e..e49252449d 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -611,7 +611,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata, err: OSSL_PARAM_BLD_free(tmpl); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OPENSSL_free(pub_key_buf); OPENSSL_free(gen_buf); BN_CTX_end(bnctx); diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index c4d534e48c..609d8609ea 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -379,7 +379,7 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata, err: OSSL_PARAM_BLD_free(tmpl); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); return rv; } diff --git a/crypto/param_build.c b/crypto/param_build.c index 6ccca9f661..e64deaa88f 100644 --- a/crypto/param_build.c +++ b/crypto/param_build.c @@ -377,8 +377,3 @@ OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld) free_all_params(bld); return params; } - -void OSSL_PARAM_BLD_free_params(OSSL_PARAM *params) -{ - OSSL_PARAM_free(params); -} diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 2155eaccd6..e633fa5c93 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -781,7 +781,7 @@ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type, rv = evp_keymgmt_import(to_keymgmt, to_keydata, selection, params); err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); return rv; } diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index 29e68bf1ae..134207d5c2 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -337,7 +337,7 @@ int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const OSSL_STORE_SEARCH *search) params = OSSL_PARAM_BLD_to_param(bld); ret = ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx, params); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); } OSSL_PARAM_BLD_free(bld); OPENSSL_free(name_der); diff --git a/doc/man3/EVP_PKEY_fromdata.pod b/doc/man3/EVP_PKEY_fromdata.pod index 40f39d7c68..1c85474662 100644 --- a/doc/man3/EVP_PKEY_fromdata.pod +++ b/doc/man3/EVP_PKEY_fromdata.pod @@ -198,7 +198,7 @@ TODO Write a set of cookbook documents and link to them. EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(ctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(param_bld); BN_free(priv); diff --git a/doc/man3/OSSL_PARAM_BLD.pod b/doc/man3/OSSL_PARAM_BLD.pod index 0a44fa63fb..9190e81c01 100644 --- a/doc/man3/OSSL_PARAM_BLD.pod +++ b/doc/man3/OSSL_PARAM_BLD.pod @@ -3,7 +3,7 @@ =head1 NAME OSSL_PARAM_BLD, OSSL_PARAM_BLD_new, OSSL_PARAM_BLD_to_param, -OSSL_PARAM_BLD_free_params, OSSL_PARAM_BLD_free, OSSL_PARAM_BLD_push_int, +OSSL_PARAM_BLD_free, OSSL_PARAM_BLD_push_int, OSSL_PARAM_BLD_push_uint, OSSL_PARAM_BLD_push_long, OSSL_PARAM_BLD_push_ulong, OSSL_PARAM_BLD_push_int32, OSSL_PARAM_BLD_push_uint32, OSSL_PARAM_BLD_push_int64, @@ -24,7 +24,6 @@ OSSL_PARAM_BLD_push_octet_string, OSSL_PARAM_BLD_push_octet_ptr OSSL_PARAM_BLD *OSSL_PARAM_BLD_new(void); OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld); - void OSSL_PARAM_BLD_free_params(OSSL_PARAM *params); void OSSL_PARAM_BLD_free(OSSL_PARAM_BLD *bld); int OSSL_PARAM_BLD_push_TYPE(OSSL_PARAM_BLD *bld, const char *key, TYPE val); @@ -58,12 +57,9 @@ OSSL_PARAM_BLD_free() deallocates the memory allocates by OSSL_PARAM_BLD_new(). OSSL_PARAM_BLD_to_param() converts a built up OSSL_PARAM_BLD structure I into an allocated OSSL_PARAM array. The OSSL_PARAM array and all associated storage must be freed by calling -OSSL_PARAM_BLD_free_params() with the functions return value. +OSSL_PARAM_free() with the functions return value. OSSL_PARAM_BLD_free() can safely be called any time after this function is. -OSSL_PARAM_BLD_free_params() deallocates the memory allocated by -OSSL_PARAM_BLD_to_param(). - =begin comment POD is pretty good at recognising function names and making them appropriately @@ -155,7 +151,7 @@ private key. OSSL_PARAM_BLD_free(bld); /* Use params */ ... - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); =head2 Example 2 @@ -173,11 +169,11 @@ public key. OSSL_PARAM_BLD_free(bld); /* Use params */ ... - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); =head1 SEE ALSO -L, L +L, L, L =head1 HISTORY diff --git a/include/openssl/param_build.h b/include/openssl/param_build.h index fff5dc9864..f29fdb2963 100644 --- a/include/openssl/param_build.h +++ b/include/openssl/param_build.h @@ -22,7 +22,6 @@ extern "C" { OSSL_PARAM_BLD *OSSL_PARAM_BLD_new(void); OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld); void OSSL_PARAM_BLD_free(OSSL_PARAM_BLD *bld); -void OSSL_PARAM_BLD_free_params(OSSL_PARAM *params); int OSSL_PARAM_BLD_push_int(OSSL_PARAM_BLD *bld, const char *key, int val); int OSSL_PARAM_BLD_push_uint(OSSL_PARAM_BLD *bld, const char *key, diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c index dbec87a0f3..ba8e835bd7 100644 --- a/providers/fips/self_test_kats.c +++ b/providers/fips/self_test_kats.c @@ -233,7 +233,7 @@ err: EVP_KDF_free(kdf); EVP_KDF_CTX_free(ctx); BN_CTX_free(bnctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); OSSL_SELF_TEST_onend(st, ret); return ret; @@ -420,8 +420,8 @@ err: EVP_PKEY_free(peerkey); EVP_PKEY_CTX_free(kactx); EVP_PKEY_CTX_free(dctx); - OSSL_PARAM_BLD_free_params(params_peer); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params_peer); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); OSSL_SELF_TEST_onend(st, ret); return ret; @@ -505,8 +505,8 @@ err: EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(kctx); EVP_PKEY_CTX_free(sctx); - OSSL_PARAM_BLD_free_params(params); - OSSL_PARAM_BLD_free_params(params_sig); + OSSL_PARAM_free(params); + OSSL_PARAM_free(params_sig); OSSL_PARAM_BLD_free(bld); OSSL_SELF_TEST_onend(st, ret); return ret; @@ -591,9 +591,9 @@ err: EVP_PKEY_free(key); EVP_PKEY_CTX_free(encctx); EVP_PKEY_CTX_free(keyctx); - OSSL_PARAM_BLD_free_params(keyparams); + OSSL_PARAM_free(keyparams); OSSL_PARAM_BLD_free(keybld); - OSSL_PARAM_BLD_free_params(initparams); + OSSL_PARAM_free(initparams); OSSL_PARAM_BLD_free(initbld); OSSL_SELF_TEST_onend(st, ret); return ret; diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index 3a78d4863a..ba56abe04a 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -212,7 +212,7 @@ static int dh_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, goto err; } ok = param_cb(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ok; diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index 02ad9ecb7d..15a40df260 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -208,7 +208,7 @@ static int dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, goto err;; ok = param_cb(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ok; diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index 58283ca8f0..fe5bd7a28a 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -489,7 +489,7 @@ int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, if (ok && (params = OSSL_PARAM_BLD_to_param(tmpl)) != NULL) ok = param_cb(params, cbarg); end: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); OPENSSL_free(pub_key); OPENSSL_free(genbuf); @@ -1158,7 +1158,7 @@ build: ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); return ret; } diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 6f58a1cb77..a0284325cc 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -236,7 +236,7 @@ static int ecx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, goto err; ret = param_cb(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ret; diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c index 9039816ee8..06e0bfb521 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -291,7 +291,7 @@ static int mac_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, goto err; ret = param_cb(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ret; diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 1bcb6ed603..fbd99e3dc8 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -207,7 +207,7 @@ static int rsa_export(void *keydata, int selection, goto err; ok = param_callback(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ok; diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index c5817fc6bc..2178be95bd 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -2104,7 +2104,7 @@ static int tls_process_ske_dhe(SSL *s, PACKET *pkt, EVP_PKEY **pkey) err: OSSL_PARAM_BLD_free(tmpl); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); EVP_PKEY_free(peer_tmp); EVP_PKEY_CTX_free(pctx); BN_free(p); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index a389b0feed..31873a3fa2 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2916,7 +2916,7 @@ EVP_PKEY *ssl_get_auto_dh(SSL *s) goto err; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); EVP_PKEY_CTX_free(pctx); BN_free(p); diff --git a/test/acvp_test.c b/test/acvp_test.c index cfed50b08d..daa2e6843a 100644 --- a/test/acvp_test.c +++ b/test/acvp_test.c @@ -176,7 +176,7 @@ static int ecdsa_create_pkey(EVP_PKEY **pkey, const char *curve_name, ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_CTX_free(ctx); return ret; @@ -517,7 +517,7 @@ static int dsa_create_pkey(EVP_PKEY **pkey, ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_CTX_free(ctx); return ret; @@ -939,7 +939,7 @@ static int dh_create_pkey(EVP_PKEY **pkey, const char *group_name, ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_CTX_free(ctx); return ret; @@ -1062,7 +1062,7 @@ static int rsa_create_pkey(EVP_PKEY **pkey, ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_CTX_free(ctx); return ret; @@ -1170,7 +1170,7 @@ err: OPENSSL_free(d); EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(ctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); return ret; } diff --git a/test/ectest.c b/test/ectest.c index 6d08d0481f..8b737149d8 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -2549,7 +2549,7 @@ err: BN_free(a_out); BN_free(b_out); BN_free(p_out); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_free(pkeyparam); EVP_PKEY_CTX_free(pctx); @@ -2896,8 +2896,8 @@ static int custom_params_test(int id) BN_CTX_end(ctx); BN_CTX_free(ctx); OSSL_PARAM_BLD_free(param_bld); - OSSL_PARAM_BLD_free_params(params1); - OSSL_PARAM_BLD_free_params(params2); + OSSL_PARAM_free(params1); + OSSL_PARAM_free(params2); EC_POINT_free(Q1); EC_POINT_free(Q2); EC_POINT_free(G2); diff --git a/test/endecode_test.c b/test/endecode_test.c index ab4b631a8f..27f8739054 100644 --- a/test/endecode_test.c +++ b/test/endecode_test.c @@ -1332,13 +1332,13 @@ int setup_tests(void) void cleanup_tests(void) { #ifndef OPENSSL_NO_EC - OSSL_PARAM_BLD_free_params(ec_explicit_prime_params_nc); - OSSL_PARAM_BLD_free_params(ec_explicit_prime_params_explicit); + OSSL_PARAM_free(ec_explicit_prime_params_nc); + OSSL_PARAM_free(ec_explicit_prime_params_explicit); OSSL_PARAM_BLD_free(bld_prime_nc); OSSL_PARAM_BLD_free(bld_prime); # ifndef OPENSSL_NO_EC2M - OSSL_PARAM_BLD_free_params(ec_explicit_tri_params_nc); - OSSL_PARAM_BLD_free_params(ec_explicit_tri_params_explicit); + OSSL_PARAM_free(ec_explicit_tri_params_nc); + OSSL_PARAM_free(ec_explicit_tri_params_explicit); OSSL_PARAM_BLD_free(bld_tri_nc); OSSL_PARAM_BLD_free(bld_tri); # endif diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index a3d0a319e8..75eeb72667 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -574,7 +574,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype) if (!test_fromdata(keytype, params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test priv and !pub */ @@ -590,7 +590,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype) if (!test_fromdata(keytype, params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test !priv and pub */ @@ -606,7 +606,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype) if (!test_fromdata(keytype, params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test priv and pub */ @@ -627,7 +627,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype) ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); BN_free(p); BN_free(q); @@ -683,7 +683,7 @@ static int test_EC_priv_pub(void) if (!test_fromdata("EC", params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test priv and !pub */ @@ -699,7 +699,7 @@ static int test_EC_priv_pub(void) if (!test_fromdata("EC", params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test !priv and pub */ @@ -716,7 +716,7 @@ static int test_EC_priv_pub(void) if (!test_fromdata("EC", params)) goto err; - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); /* Test priv and pub */ @@ -738,7 +738,7 @@ static int test_EC_priv_pub(void) ret = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); BN_free(priv); @@ -2083,7 +2083,7 @@ static int test_DSA_get_set_params(void) err: EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(pctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); BN_free(p); BN_free(q); @@ -2144,7 +2144,7 @@ static int test_RSA_get_set_params(void) err: EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(pctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); BN_free(n); BN_free(e); diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 6aa566cac4..c935e6288b 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -446,7 +446,7 @@ static int test_evp_pkey_get_bn_param_large(void) EVP_PKEY_free(pk); EVP_PKEY_CTX_free(key_ctx); EVP_PKEY_CTX_free(ctx); - OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_free(fromdata_params); OSSL_PARAM_BLD_free(bld); return ret; } @@ -627,7 +627,7 @@ err: EVP_PKEY_free(pk); EVP_PKEY_CTX_free(ctx); EVP_PKEY_CTX_free(key_ctx); - OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_free(fromdata_params); OSSL_PARAM_BLD_free(bld); return ret; @@ -801,7 +801,7 @@ err: EVP_PKEY_free(pk); EVP_PKEY_CTX_free(ctx); EVP_PKEY_CTX_free(key_ctx); - OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_free(fromdata_params); OSSL_PARAM_BLD_free(bld); return ret; @@ -1200,7 +1200,7 @@ static int test_fromdata_ec(void) err: BN_free(bn_priv); BN_free(ec_priv_bn); - OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_free(fromdata_params); OSSL_PARAM_BLD_free(bld); EVP_PKEY_free(pk); EVP_PKEY_free(copy_pk); @@ -1519,7 +1519,7 @@ static int test_fromdata_dsa_fips186_4(void) } err: - OSSL_PARAM_BLD_free_params(fromdata_params); + OSSL_PARAM_free(fromdata_params); OSSL_PARAM_BLD_free(bld); BN_free(p); BN_free(q); diff --git a/test/helpers/predefined_dhparams.c b/test/helpers/predefined_dhparams.c index 378d7b56e0..a6dd8c08a5 100644 --- a/test/helpers/predefined_dhparams.c +++ b/test/helpers/predefined_dhparams.c @@ -40,7 +40,7 @@ static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type, err: EVP_PKEY_CTX_free(pctx); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(tmpl); return dhpkey; } diff --git a/test/param_build_test.c b/test/param_build_test.c index 6419582e11..e08bb31bf6 100644 --- a/test/param_build_test.c +++ b/test/param_build_test.c @@ -130,7 +130,7 @@ err: OPENSSL_free(p1); if (params != params_blt) OPENSSL_free(params); - OSSL_PARAM_BLD_free_params(params_blt); + OSSL_PARAM_free(params_blt); OSSL_PARAM_BLD_free(bld); OPENSSL_free(utf); BN_free(bn); @@ -265,7 +265,7 @@ err: OSSL_PARAM_free(p1); if (params != params_blt) OSSL_PARAM_free(params); - OSSL_PARAM_BLD_free_params(params_blt); + OSSL_PARAM_free(params_blt); OSSL_PARAM_BLD_free(bld); OPENSSL_secure_free(data1); OPENSSL_secure_free(data2); @@ -300,7 +300,7 @@ static int builder_limit_test(void) goto err; /* Verify that the build, cleared the builder structure */ - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); params = NULL; if (!TEST_true(OSSL_PARAM_BLD_push_int(bld, "g", 2)) @@ -312,7 +312,7 @@ static int builder_limit_test(void) goto err; res = 1; err: - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); OSSL_PARAM_BLD_free(bld); return res; } diff --git a/test/sslapitest.c b/test/sslapitest.c index 2d196a155c..122238edcb 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -8302,7 +8302,7 @@ static EVP_PKEY *get_tmp_dh_params(void) BN_free(p); EVP_PKEY_CTX_free(pctx); OSSL_PARAM_BLD_free(tmpl); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); } if (tmp_dh_params != NULL && !EVP_PKEY_up_ref(tmp_dh_params)) diff --git a/util/libcrypto.num b/util/libcrypto.num index 77082c2d05..2dc8d28118 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4956,7 +4956,6 @@ NCONF_new_ex ? 3_0_0 EXIST::FUNCTION: CONF_modules_load_file_ex ? 3_0_0 EXIST::FUNCTION: OSSL_LIB_CTX_load_config ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_BLD_to_param ? 3_0_0 EXIST::FUNCTION: -OSSL_PARAM_BLD_free_params ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_BLD_push_int ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_BLD_push_uint ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_BLD_push_long ? 3_0_0 EXIST::FUNCTION: