diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-07 13:45:19 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-04-12 16:55:30 +1000 |
commit | 3f883c7c835ff577a6df37e238956c5b9016dc93 (patch) | |
tree | 53981bf279887c1dc043e264cbaa61710b75c2b9 /providers/implementations/keymgmt | |
parent | 884314cab786a980189206b2cab5f62878a97669 (diff) |
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 'providers/implementations/keymgmt')
-rw-r--r-- | providers/implementations/keymgmt/dh_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/dsa_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/mac_legacy_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/rsa_kmgmt.c | 2 |
6 files changed, 7 insertions, 7 deletions
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; |