diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-27 18:40:05 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-08-01 11:51:19 +1000 |
| commit | 7c664b1f1b5f60bf896f5fdea5c08c401c541dfe (patch) | |
| tree | 56b5f9705be72e3139bfadfcfed94eca5ae04ea2 /util | |
| parent | 3ff8159a8af6ab4e945318c56cd2fffcdd817cf8 (diff) | |
DESERIALIZER: Add deserializers for the rest of our asymmetric key types
To be able to implement this, there was a need for the standard
EVP_PKEY_set1_, EVP_PKEY_get0_ and EVP_PKEY_get1_ functions for
ED25519, ED448, X25519 and X448, as well as the corresponding
EVP_PKEY_assign_ macros. There was also a need to extend the list of
hard coded names that EVP_PKEY_is_a() recognise.
Along with this, OSSL_FUNC_keymgmt_load() are implemented for all
those key types.
The deserializers for these key types are all implemented generically,
in providers/implementations/serializers/deserializer_der2key.c.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12544)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 12 | ||||
| -rw-r--r-- | util/other.syms | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 11f230ae1c..0c94a3e7dc 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5180,3 +5180,15 @@ ERR_load_OSSL_DESERIALIZER_strings ? 3_0_0 EXIST::FUNCTION: OSSL_DESERIALIZER_gettable_params ? 3_0_0 EXIST::FUNCTION: OSSL_DESERIALIZER_get_params ? 3_0_0 EXIST::FUNCTION: OSSL_DESERIALIZER_CTX_new_by_EVP_PKEY ? 3_0_0 EXIST::FUNCTION: +EVP_PKEY_set1_X25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get0_X25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get1_X25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_set1_X448 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get0_X448 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get1_X448 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_set1_ED25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get0_ED25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get1_ED25519 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_set1_ED448 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get0_ED448 ? 3_0_0 EXIST::FUNCTION:EC +EVP_PKEY_get1_ED448 ? 3_0_0 EXIST::FUNCTION:EC diff --git a/util/other.syms b/util/other.syms index 38ad3d3a33..a8eda47bde 100644 --- a/util/other.syms +++ b/util/other.syms @@ -305,6 +305,10 @@ EVP_PKEY_CTX_set_tls1_prf_md define EVP_PKEY_assign_DH define EVP_PKEY_assign_DSA define EVP_PKEY_assign_EC_KEY define +EVP_PKEY_assign_ED25519 define +EVP_PKEY_assign_ED448 define +EVP_PKEY_assign_X25519 define +EVP_PKEY_assign_X448 define EVP_PKEY_assign_POLY1305 define EVP_PKEY_assign_RSA define EVP_PKEY_assign_SIPHASH define |