From c1ee50aac26c3b2261d04d61bb4154639e284b0d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 25 Mar 2015 15:42:56 +0000 Subject: [PATCH] Move internal only ASN.1 functions to asn1_locl.h Reviewed-by: Richard Levitte --- crypto/asn1/asn1_locl.h | 23 +++++++++++++++++++++++ crypto/asn1/asn1t.h | 23 ----------------------- crypto/asn1/tasn_dec.c | 1 + crypto/asn1/tasn_enc.c | 1 + crypto/asn1/tasn_fre.c | 1 + crypto/asn1/tasn_new.c | 1 + crypto/asn1/tasn_prn.c | 1 + crypto/asn1/tasn_utl.c | 1 + 8 files changed, 29 insertions(+), 23 deletions(-) diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_locl.h index ec4c0e8052..79d76ecc72 100644 --- a/crypto/asn1/asn1_locl.h +++ b/crypto/asn1/asn1_locl.h @@ -104,3 +104,26 @@ struct x509_crl_method_st { ASN1_INTEGER *ser, X509_NAME *issuer); int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk); }; + +int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, + const ASN1_ITEM *it); +int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, + int utype, char *free_cont, const ASN1_ITEM *it); + +int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it); +int asn1_set_choice_selector(ASN1_VALUE **pval, int value, + const ASN1_ITEM *it); + +ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); + +const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt, + int nullerr); + +int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it); + +void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it); +void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it); +int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, + const ASN1_ITEM *it); +int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen, + const ASN1_ITEM *it); diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h index 3dcca325de..e6f6d79c7e 100644 --- a/crypto/asn1/asn1t.h +++ b/crypto/asn1/asn1t.h @@ -910,29 +910,6 @@ int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out, const ASN1_TEMPLATE *tt); void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it); -int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype, - const ASN1_ITEM *it); -int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, - int utype, char *free_cont, const ASN1_ITEM *it); - -int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it); -int asn1_set_choice_selector(ASN1_VALUE **pval, int value, - const ASN1_ITEM *it); - -ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt); - -const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt, - int nullerr); - -int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it); - -void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it); -void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it); -int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, - const ASN1_ITEM *it); -int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen, - const ASN1_ITEM *it); - #ifdef __cplusplus } #endif diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index b96c1b58bb..5111c123bd 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -64,6 +64,7 @@ #include #include #include +#include "asn1_locl.h" static int asn1_check_eoc(const unsigned char **in, long len); static int asn1_find_end(const unsigned char **in, long len, char inf); diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 1d1f838078..251a8f15b4 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -64,6 +64,7 @@ #include #include #include "internal/asn1_int.h" +#include "asn1_locl.h" static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c index bdc26f9bb4..6f62fd4a71 100644 --- a/crypto/asn1/tasn_fre.c +++ b/crypto/asn1/tasn_fre.c @@ -61,6 +61,7 @@ #include #include #include +#include "asn1_locl.h" static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine); diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c index 3884897a4e..996a4d5cc6 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -63,6 +63,7 @@ #include #include #include +#include "asn1_locl.h" static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine); diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index cb3d35b63d..d1e5ba509a 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -66,6 +66,7 @@ #include #include #include "internal/asn1_int.h" +#include "asn1_locl.h" /* * Print routines. diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 2e14c2f8db..da7b029799 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -63,6 +63,7 @@ #include #include #include +#include "asn1_locl.h" /* Utility functions for manipulating fields and offsets */ -- 2.34.1