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

Make asn1_ex_i2c, asn1_ex_c2i static. 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent ee9d7637

crypto/asn1/asn1_locl.h

+0 −5
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ struct x509_crl_method_st { 
    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);

crypto/asn1/tasn_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, 
                                 const ASN1_ITEM *it,

                                 int tag, int aclass, char opt,

                                 ASN1_TLC *ctx);

static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,

                       int utype, char *free_cont, const ASN1_ITEM *it);



/* Table to convert tags to bit values, used for MSTRING type */

static const unsigned long tag2bit[32] = {
@@ -770,7 +772,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, 


/* Translate ASN1 content octets into a structure */



int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,

static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,

                       int utype, char *free_cont, const ASN1_ITEM *it)

{

    ASN1_VALUE **opval = NULL;

crypto/asn1/tasn_enc.c

+4 −2
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out, 
                                const ASN1_TEMPLATE *tt, int tag, int aclass);

static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,

                               const ASN1_ITEM *it, int flags);

static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,

                       const ASN1_ITEM *it);



/*

 * Top level i2d equivalents: the 'ndef' variant instructs the encoder to use
@@ -517,7 +519,7 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, 


/* Produce content octets from a structure */



int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,

static int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,

                       const ASN1_ITEM *it)

{

    ASN1_BOOLEAN *tbool = NULL;