diff options
author | Matt Caswell <matt@openssl.org> | 2020-08-12 13:41:59 +0100 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-08-29 17:40:11 +1000 |
commit | 2cf765e5a20762df1442c80cd2afc99e8bb1b823 (patch) | |
tree | 3d60094e569638e0e69960945254b28ea78172d1 /include | |
parent | a540ef90f55c1e10feb709d09332dfa352d9f33e (diff) |
Delete unused PKEY MAC files
Now that the all the legacy PKEY MAC bridge code has been moved to the
providers we no longer need the old bridge and it can be removed.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12637)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/asn1.h | 4 | ||||
-rw-r--r-- | include/crypto/evp.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h index 68672d1a02..041642f022 100644 --- a/include/crypto/asn1.h +++ b/include/crypto/asn1.h @@ -86,7 +86,6 @@ struct evp_pkey_asn1_method_st { DEFINE_STACK_OF_CONST(EVP_PKEY_ASN1_METHOD) -extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth; extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[5]; @@ -96,12 +95,9 @@ extern const EVP_PKEY_ASN1_METHOD ecx448_asn1_meth; extern const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth; extern const EVP_PKEY_ASN1_METHOD ed448_asn1_meth; extern const EVP_PKEY_ASN1_METHOD sm2_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD poly1305_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2]; extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; -extern const EVP_PKEY_ASN1_METHOD siphash_asn1_meth; /* * These are used internally in the ASN1_OBJECT to keep track of whether the diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 512b4d6f48..634eb86425 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -131,7 +131,6 @@ DEFINE_STACK_OF_CONST(EVP_PKEY_METHOD) void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); -const EVP_PKEY_METHOD *cmac_pkey_method(void); const EVP_PKEY_METHOD *dh_pkey_method(void); const EVP_PKEY_METHOD *dhx_pkey_method(void); const EVP_PKEY_METHOD *dsa_pkey_method(void); @@ -141,11 +140,8 @@ const EVP_PKEY_METHOD *ecx25519_pkey_method(void); const EVP_PKEY_METHOD *ecx448_pkey_method(void); const EVP_PKEY_METHOD *ed25519_pkey_method(void); const EVP_PKEY_METHOD *ed448_pkey_method(void); -const EVP_PKEY_METHOD *hmac_pkey_method(void); const EVP_PKEY_METHOD *rsa_pkey_method(void); const EVP_PKEY_METHOD *rsa_pss_pkey_method(void); -const EVP_PKEY_METHOD *poly1305_pkey_method(void); -const EVP_PKEY_METHOD *siphash_pkey_method(void); struct evp_mac_st { OSSL_PROVIDER *prov; |