generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make asn1_ex_i2c, asn1_ex_c2i static.

Browse Source 
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-03-28 12:08:48 +00:00
parent ee9d76371a
commit 23dc1706e8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/asn1/asn1_locl.h
View File

@ -105,11 +105,6 @@ struct x509_crl_method_st {
int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk); 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_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
int asn1_set_choice_selector(ASN1_VALUE **pval, int value, int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
const ASN1_ITEM *it); const ASN1_ITEM *it);

6
crypto/asn1/tasn_dec.c
View File

@ -92,6 +92,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
const ASN1_ITEM *it, const ASN1_ITEM *it,
int tag, int aclass, char opt, int tag, int aclass, char opt,
ASN1_TLC *ctx); 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 */ /* Table to convert tags to bit values, used for MSTRING type */
static const unsigned long tag2bit[32] = { static const unsigned long tag2bit[32] = {
@ -770,8 +772,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
/* Translate ASN1 content octets into a structure */ /* 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) int utype, char *free_cont, const ASN1_ITEM *it)
{ {
ASN1_VALUE **opval = NULL; ASN1_VALUE **opval = NULL;
ASN1_STRING *stmp; ASN1_STRING *stmp;

6
crypto/asn1/tasn_enc.c
View File

@ -75,6 +75,8 @@ static int asn1_template_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
const ASN1_TEMPLATE *tt, int tag, int aclass); const ASN1_TEMPLATE *tt, int tag, int aclass);
static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out, static int asn1_item_flags_i2d(ASN1_VALUE *val, unsigned char **out,
const ASN1_ITEM *it, int flags); 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 * Top level i2d equivalents: the 'ndef' variant instructs the encoder to use
@ -517,8 +519,8 @@ static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out,
/* Produce content octets from a structure */ /* 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) const ASN1_ITEM *it)
{ {
ASN1_BOOLEAN *tbool = NULL; ASN1_BOOLEAN *tbool = NULL;
ASN1_STRING *strtmp; ASN1_STRING *strtmp;