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

Move internal only ASN.1 functions to asn1_locl.h 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent e20b5727

crypto/asn1/asn1_locl.h

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

crypto/asn1/asn1t.h

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

crypto/asn1/tasn_dec.c

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

#include <openssl/buffer.h>

#include <openssl/err.h>

#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);

crypto/asn1/tasn_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include <openssl/asn1t.h>

#include <openssl/objects.h>

#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);

crypto/asn1/tasn_fre.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <openssl/asn1.h>

#include <openssl/asn1t.h>

#include <openssl/objects.h>

#include "asn1_locl.h"



static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,

                                   int combine);