Commit 5fe736e5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
parent 0dfb9398

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ TOP= .. 
CC=		cc

INCLUDE=	-I. -I$(TOP) -I../include $(ZLIB_INCLUDE)

# INCLUDES targets sudbirs!

INCLUDES=	-I.. -I../.. -I../modes -I../asn1 -I../evp -I../include -I../../include $(ZLIB_INCLUDE)

INCLUDES=	-I.. -I../.. -I../modes -I../evp -I../include -I../../include $(ZLIB_INCLUDE)

CFLAG=		-g

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

crypto/asn1/a_sign.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
#include <openssl/x509.h>

#include <openssl/objects.h>

#include <openssl/buffer.h>

#include "asn1_locl.h"

#include "internal/asn1_int.h"



#ifndef NO_ASN1_OLD

crypto/asn1/a_verify.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
#include <openssl/objects.h>

#include <openssl/buffer.h>

#include <openssl/evp.h>

#include "asn1_locl.h"

#include "internal/asn1_int.h"



#ifndef NO_ASN1_OLD

crypto/asn1/ameth_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#ifndef OPENSSL_NO_ENGINE

# include <openssl/engine.h>

#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[];

crypto/asn1/asn1_locl.h

+0 −45
Original line number Diff line number Diff line
@@ -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