From 5fe736e5fc29353706c2c1a5ae8bd97f3d7a35e9 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 23 Mar 2015 18:42:42 +0000 Subject: Move some ASN.1 internals to asn1_int.h Move ASN.1 internals used across multiple directories into new internal header file asn1_int.h remove crypto/Makefile hack which allowed other directories to include "asn1_locl.h" Reviewed-by: Matt Caswell --- crypto/asn1/a_sign.c | 2 +- crypto/asn1/a_verify.c | 2 +- crypto/asn1/ameth_lib.c | 2 +- crypto/asn1/asn1_locl.h | 45 --------------------------------------------- crypto/asn1/d2i_pr.c | 2 +- crypto/asn1/i2d_pr.c | 2 +- crypto/asn1/t_x509.c | 2 +- crypto/asn1/x_pubkey.c | 2 +- 8 files changed, 7 insertions(+), 52 deletions(-) (limited to 'crypto/asn1') diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 51c6a0c34d..9fe6665fbc 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -123,7 +123,7 @@ #include #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" #ifndef NO_ASN1_OLD diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index e242d834df..6023b148f0 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -70,7 +70,7 @@ #include #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" #ifndef NO_ASN1_OLD diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 67353e06db..5c7d6bb207 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -63,7 +63,7 @@ #ifndef OPENSSL_NO_ENGINE # include #endif -#include "asn1_locl.h" +#include "internal/asn1_int.h" extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h index 211380269b..a7569e7387 100644 --- a/crypto/asn1/asn1_locl.h +++ b/crypto/asn1/asn1_locl.h @@ -97,51 +97,6 @@ struct asn1_sctx_st { void *app_data; } /* ASN1_SCTX */ ; -/* 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, 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); -} /* 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 diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index c96da091d3..5f1a96d808 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -66,7 +66,7 @@ #endif #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length) diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 4d338ac55a..2a6aa19c07 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index 667db2625a..e97222021f 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -72,7 +72,7 @@ #include #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" #ifndef OPENSSL_NO_STDIO int X509_print_fp(FILE *fp, X509 *x) diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 4b682018c2..cefaf3ac40 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include #include -#include "asn1_locl.h" +#include "internal/asn1_int.h" #ifndef OPENSSL_NO_RSA # include #endif -- cgit v1.2.3