diff options
| author | David Benjamin <davidben@chromium.org> | 2015-11-21 01:50:41 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-12-16 20:38:06 +0300 |
| commit | c3ae38b4f86e56738729e6261674712c8cd6edb7 (patch) | |
| tree | 51af71e1c98f1bf0cde6a9d1141f97720487e3e5 /include/openssl/evp.h | |
| parent | 7100ee9832b5579e8497d1c90df5c2db8c5913cc (diff) | |
Remove DH EVP_PKEY hooks.
They would never work. Better notice when callers depend on it than fail at
runtime.
This depends on https://android-review.googlesource.com/#/c/183610/ in
Conscrypt.
Change-Id: I3411f291416df834cf85850890617625a2e76939
Reviewed-on: https://boringssl-review.googlesource.com/6552
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include/openssl/evp.h')
| -rw-r--r-- | include/openssl/evp.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index e479e5ea..be2ea332 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -163,16 +163,10 @@ OPENSSL_EXPORT int EVP_PKEY_assign_EC_KEY(EVP_PKEY *pkey, EC_KEY *key); OPENSSL_EXPORT EC_KEY *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey); OPENSSL_EXPORT EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey); -OPENSSL_EXPORT int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key); -OPENSSL_EXPORT int EVP_PKEY_assign_DH(EVP_PKEY *pkey, DH *key); -OPENSSL_EXPORT DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey); - #define EVP_PKEY_NONE NID_undef #define EVP_PKEY_RSA NID_rsaEncryption #define EVP_PKEY_RSA2 NID_rsa #define EVP_PKEY_DSA NID_dsa -#define EVP_PKEY_DH NID_dhKeyAgreement -#define EVP_PKEY_DHX NID_dhpublicnumber #define EVP_PKEY_EC NID_X9_62_id_ecPublicKey /* EVP_PKEY_assign sets the underlying key of |pkey| to |key|, which must be of @@ -648,6 +642,10 @@ OPENSSL_EXPORT int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, /* Deprecated functions. */ +/* EVP_PKEY_DH is defined for compatibility, but it is impossible to create an + * |EVP_PKEY| of that type. */ +#define EVP_PKEY_DH NID_dhKeyAgreement + /* OpenSSL_add_all_algorithms does nothing. */ OPENSSL_EXPORT void OpenSSL_add_all_algorithms(void); |