Move the EVP_PKEY_asn1_* API that will stay to evp/p_lib.c

Most of these functions are only called from this file internally apart
from the pem_str lookups from pem/. In the next major bump we can then
remove asn/ameth_lib.c. Also move EVP_PKEY_ASN1_METHOD to evp_local.h.
While this is used to dispatch to various ASN.1 decoding routines, it
doesn't fit into asn1/ at all.

1 files changed, 1 insertions, 65 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_local.h b/src/lib/libcrypto/asn1/asn1_local.h
index 566ace798b..c1dfa6f68c 100644
--- a/src/lib/libcrypto/asn1/asn1_local.h
+++ b/src/lib/libcrypto/asn1/asn1_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_local.h,v 1.4 2023/07/28 10:00:10 tb Exp $ */
+/* $OpenBSD: asn1_local.h,v 1.5 2023/12/29 10:59:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -89,70 +89,6 @@ struct asn1_pctx_st {
         unsigned long str_flags;
 } /* ASN1_PCTX */;
 
-/* ASN1 public key method structure */
-
-struct evp_pkey_asn1_method_st {
-        int pkey_id;
-        int pkey_base_id;
-        unsigned long pkey_flags;
-
-        char *pem_str;
-        char *info;
-
-        int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);
-        int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);
-        int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
-        int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-
-        int (*priv_decode)(EVP_PKEY *pk, const PKCS8_PRIV_KEY_INFO *p8inf);
-        int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
-        int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-
-        int (*pkey_size)(const EVP_PKEY *pk);
-        int (*pkey_bits)(const EVP_PKEY *pk);
-        int (*pkey_security_bits)(const EVP_PKEY *pk);
-
-        int (*param_decode)(EVP_PKEY *pkey, const unsigned char **pder,
-            int derlen);
-        int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder);
-        int (*param_missing)(const EVP_PKEY *pk);
-        int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);
-        int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
-        int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
-            ASN1_PCTX *pctx);
-        int (*sig_print)(BIO *out, const X509_ALGOR *sigalg,
-            const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx);
-
-        void (*pkey_free)(EVP_PKEY *pkey);
-        int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
-
-        /* Legacy functions for old PEM */
-
-        int (*old_priv_decode)(EVP_PKEY *pkey, const unsigned char **pder,
-            int derlen);
-        int (*old_priv_encode)(const EVP_PKEY *pkey, unsigned char **pder);
-        /* Custom ASN1 signature verification */
-        int (*item_verify)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-            X509_ALGOR *a, ASN1_BIT_STRING *sig, EVP_PKEY *pkey);
-        int (*item_sign)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
-            X509_ALGOR *alg1, X509_ALGOR *alg2, ASN1_BIT_STRING *sig);
-
-        int (*pkey_check)(const EVP_PKEY *pk);
-        int (*pkey_public_check)(const EVP_PKEY *pk);
-        int (*pkey_param_check)(const EVP_PKEY *pk);
-
-        int (*set_priv_key)(EVP_PKEY *pk, const unsigned char *private_key,
-            size_t len);
-        int (*set_pub_key)(EVP_PKEY *pk, const unsigned char *public_key,
-            size_t len);
-        int (*get_priv_key)(const EVP_PKEY *pk, unsigned char *out_private_key,
-            size_t *out_len);
-        int (*get_pub_key)(const EVP_PKEY *pk, unsigned char *out_public_key,
-            size_t *out_len);
-} /* EVP_PKEY_ASN1_METHOD */;
-
 /* Method to handle CRL access.
  * In general a CRL could be very large (several Mb) and can consume large
  * amounts of resources if stored in memory by multiple processes.