diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-07 05:45:19 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-04-12 08:55:30 +0200 |
| commit | 3f883c7c835ff577a6df37e238956c5b9016dc93 (patch) | |
| tree | 53981bf279887c1dc043e264cbaa61710b75c2b9 /crypto | |
| parent | Add OSSL_PARAM_dup() and OSSL_PARAM_merge(). (diff) | |
| download | openssl-3f883c7c835ff577a6df37e238956c5b9016dc93.tar.xz openssl-3f883c7c835ff577a6df37e238956c5b9016dc93.zip | |
Replace OSSL_PARAM_BLD_free_params() with OSSL_PARAM_free().
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14785)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dh/dh_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/dsa/dsa_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/ec/ec_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/ec/ecx_meth.c | 2 | ||||
| -rw-r--r-- | crypto/param_build.c | 5 | ||||
| -rw-r--r-- | crypto/rsa/rsa_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/store/store_lib.c | 2 |
7 files changed, 6 insertions, 11 deletions
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); |