diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-04-08 18:25:26 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-04-15 09:19:39 +0200 |
commit | b4f447c038c05260491eb880e4a9c420b476c119 (patch) | |
tree | 1f77cb414be14032b47264c1c98356c9398b4516 /providers/implementations/keymgmt | |
parent | 4a9fe33c8e12f4fefae0471c0834f8e674dc7e4e (diff) |
Add selection support to the provider keymgmt_dup function
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14793)
Diffstat (limited to 'providers/implementations/keymgmt')
-rw-r--r-- | providers/implementations/keymgmt/dh_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/dsa_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 4 | ||||
-rw-r--r-- | providers/implementations/keymgmt/rsa_kmgmt.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index f7b10a1d00..b3678c5e2a 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -722,10 +722,10 @@ static void *dh_load(const void *reference, size_t reference_sz) return NULL; } -static void *dh_dup(const void *keydata_from) +static void *dh_dup(const void *keydata_from, int selection) { if (ossl_prov_is_running()) - return ossl_dh_dup(keydata_from); + return ossl_dh_dup(keydata_from, selection); return NULL; } diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index 0d3b6ae36c..38e682f3b6 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -612,10 +612,10 @@ static void *dsa_load(const void *reference, size_t reference_sz) return NULL; } -static void *dsa_dup(const void *keydata_from) +static void *dsa_dup(const void *keydata_from, int selection) { if (ossl_prov_is_running()) - return ossl_dsa_dup(keydata_from); + return ossl_dsa_dup(keydata_from, selection); return NULL; } diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index c525ffc81a..f563d920c4 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -1362,10 +1362,10 @@ static void *sm2_load(const void *reference, size_t reference_sz) # endif #endif -static void *ec_dup(const void *keydata_from) +static void *ec_dup(const void *keydata_from, int selection) { if (ossl_prov_is_running()) - return EC_KEY_dup(keydata_from); + return ossl_ec_key_dup(keydata_from, selection); return NULL; } diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index e072cdc851..45593be544 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -692,10 +692,10 @@ void *ecx_load(const void *reference, size_t reference_sz) return NULL; } -static void *ecx_dup(const void *keydata_from) +static void *ecx_dup(const void *keydata_from, int selection) { if (ossl_prov_is_running()) - return ossl_ecx_key_dup(keydata_from); + return ossl_ecx_key_dup(keydata_from, selection); return NULL; } diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 5760d7650f..f0d1896ec0 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -646,10 +646,10 @@ static void *rsapss_load(const void *reference, size_t reference_sz) return common_load(reference, reference_sz, RSA_FLAG_TYPE_RSASSAPSS); } -static void *rsa_dup(const void *keydata_from) +static void *rsa_dup(const void *keydata_from, int selection) { if (ossl_prov_is_running()) - return ossl_rsa_dup(keydata_from); + return ossl_rsa_dup(keydata_from, selection); return NULL; } |