summaryrefslogtreecommitdiffstats
path: root/crypto/params.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-04-07 11:27:18 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-04-12 16:55:29 +1000
commit884314cab786a980189206b2cab5f62878a97669 (patch)
treed9b618c36ea0ab2a5401cbf592f1c1282f6d6de5 /crypto/params.c
parentd36114d7cd363d505940326f5a2512d9661a67ea (diff)
Add OSSL_PARAM_dup() and OSSL_PARAM_merge().
These functions are prerequisites for implementing EVP_PKEY_todata(). OSSL_PARAM_dup() is required to make a deep copy of the exported params (since the provider export() uses a OSSL_PARAM_BLD which throws away the data after the call), and then use OSSL_PARAM_merge() to add some additional params that can be passed to the EVP_PKEY_todata(). Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14785)
Diffstat (limited to 'crypto/params.c')
-rw-r--r--crypto/params.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/params.c b/crypto/params.c
index a1ed245a3c..50e900a406 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -1291,4 +1291,3 @@ int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val,
return OSSL_PARAM_get_octet_ptr(p, val, used_len)
|| get_string_ptr_internal(p, val, used_len, OSSL_PARAM_OCTET_STRING);
}
-