diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-05 13:55:50 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-08 16:33:43 +1000 |
| commit | 2db985b7b1e20ac670d196981aa7e8f31881d2eb (patch) | |
| tree | 9c2a8d81fd86e6d92f497908488abb1766f93490 /util | |
| parent | 64954e2f34b8839ca7ad1e9576a6efaf3e49e17c (diff) | |
Simplify the EVP_PKEY_XXX_fromdata_XX methods.
The existing names such as EVP_PKEY_param_fromdata_settable were a bit
confusing since the 'param' referred to key params not OSSL_PARAM. To simplify
the interface a 'selection' parameter will be passed instead. The
changes are:
(1) EVP_PKEY_fromdata_init() replaces both EVP_PKEY_key_fromdata_init() and EVP_PKEY_param_fromdata_init().
(2) EVP_PKEY_fromdata() has an additional selection parameter.
(3) EVP_PKEY_fromdata_settable() replaces EVP_PKEY_key_fromdata_settable() and EVP_PKEY_param_fromdata_settable().
EVP_PKEY_fromdata_settable() also uses a selection parameter.
Fixes #12989
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14076)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index c591ab8ec5..f72749f062 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4798,11 +4798,7 @@ X509_add_certs ? 3_0_0 EXIST::FUNCTION: X509_STORE_load_file ? 3_0_0 EXIST::FUNCTION: X509_STORE_load_path ? 3_0_0 EXIST::FUNCTION: X509_STORE_load_store ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_param_fromdata_init ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_key_fromdata_init ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_fromdata ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_param_fromdata_settable ? 3_0_0 EXIST::FUNCTION: -EVP_PKEY_key_fromdata_settable ? 3_0_0 EXIST::FUNCTION: EVP_ASYM_CIPHER_free ? 3_0_0 EXIST::FUNCTION: EVP_ASYM_CIPHER_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_ASYM_CIPHER_provider ? 3_0_0 EXIST::FUNCTION: @@ -5300,3 +5296,5 @@ EVP_PKEY_set_octet_string_param ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_get_ec_point_conv_form ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_get_field_type ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_get_params ? 3_0_0 EXIST::FUNCTION: +EVP_PKEY_fromdata_init ? 3_0_0 EXIST::FUNCTION: +EVP_PKEY_fromdata_settable ? 3_0_0 EXIST::FUNCTION: |