diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-25 12:12:22 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-25 12:12:22 +1000 |
| commit | 25b16562d386bfd30c7059366d09864260d9f271 (patch) | |
| tree | c4060f294e6953a68077b7561fa84f6d1493044e /include | |
| parent | 21e5be854deb65f54661c8231a9a30a453a173e0 (diff) | |
Hide ECX_KEY again
ECX_KEY was not meant for public consumption, it was only to be
accessed indirectly via EVP routines. However, we still need internal
access for our decoders.
This partially reverts 7c664b1f1b5f60bf896f5fdea5c08c401c541dfe
Fixes #12880
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12956)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/ecx.h | 5 | ||||
| -rw-r--r-- | include/openssl/evp.h | 21 |
2 files changed, 5 insertions, 21 deletions
diff --git a/include/crypto/ecx.h b/include/crypto/ecx.h index 72cf5dd843..8730f93872 100644 --- a/include/crypto/ecx.h +++ b/include/crypto/ecx.h @@ -111,10 +111,15 @@ int X448(uint8_t out_shared_key[56], const uint8_t private_key[56], void X448_public_from_private(uint8_t out_public_value[56], const uint8_t private_key[56]); + /* Backend support */ int ecx_public_from_private(ECX_KEY *key); int ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM params[], int include_private); +ECX_KEY *evp_pkey_get1_X25519(EVP_PKEY *pkey); +ECX_KEY *evp_pkey_get1_X448(EVP_PKEY *pkey); +ECX_KEY *evp_pkey_get1_ED25519(EVP_PKEY *pkey); +ECX_KEY *evp_pkey_get1_ED448(EVP_PKEY *pkey); # endif /* OPENSSL_NO_EC */ #endif diff --git a/include/openssl/evp.h b/include/openssl/evp.h index e843a48b22..ab5ca6b440 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -465,14 +465,6 @@ typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass, # ifndef OPENSSL_NO_EC # define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\ (eckey)) -# define EVP_PKEY_assign_X25519(pkey,ecxkey) EVP_PKEY_assign((pkey),EVP_PKEY_X25519,\ - (ecxkey)) -# define EVP_PKEY_assign_X448(pkey,ecxkey) EVP_PKEY_assign((pkey),EVP_PKEY_X448,\ - (ecxkey)) -# define EVP_PKEY_assign_ED25519(pkey,ecxkey) EVP_PKEY_assign((pkey),EVP_PKEY_ED25519,\ - (ecxkey)) -# define EVP_PKEY_assign_ED448(pkey,ecxkey) EVP_PKEY_assign((pkey),EVP_PKEY_ED448,\ - (ecxkey)) # endif # ifndef OPENSSL_NO_SIPHASH # define EVP_PKEY_assign_SIPHASH(pkey,shkey) EVP_PKEY_assign((pkey),\ @@ -1241,19 +1233,6 @@ struct ec_key_st; int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key); struct ec_key_st *EVP_PKEY_get0_EC_KEY(const EVP_PKEY *pkey); struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); -struct ecx_key_st; -int EVP_PKEY_set1_X25519(EVP_PKEY *pkey, struct ecx_key_st *key); -struct ecx_key_st *EVP_PKEY_get0_X25519(const EVP_PKEY *pkey); -struct ecx_key_st *EVP_PKEY_get1_X25519(EVP_PKEY *pkey); -int EVP_PKEY_set1_X448(EVP_PKEY *pkey, struct ecx_key_st *key); -struct ecx_key_st *EVP_PKEY_get0_X448(const EVP_PKEY *pkey); -struct ecx_key_st *EVP_PKEY_get1_X448(EVP_PKEY *pkey); -int EVP_PKEY_set1_ED25519(EVP_PKEY *pkey, struct ecx_key_st *key); -struct ecx_key_st *EVP_PKEY_get0_ED25519(const EVP_PKEY *pkey); -struct ecx_key_st *EVP_PKEY_get1_ED25519(EVP_PKEY *pkey); -int EVP_PKEY_set1_ED448(EVP_PKEY *pkey, struct ecx_key_st *key); -struct ecx_key_st *EVP_PKEY_get0_ED448(const EVP_PKEY *pkey); -struct ecx_key_st *EVP_PKEY_get1_ED448(EVP_PKEY *pkey); # endif EVP_PKEY *EVP_PKEY_new(void); |