Commit 9fdcc21f authored by David von Oheimb's avatar David von Oheimb Committed by Matt Caswell
Browse files

constify *_dup() and *i2d_*() and related functions as far as possible,... 


constify *_dup() and *i2d_*() and related functions as far as possible, introducing DECLARE_ASN1_DUP_FUNCTION

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8029)
parent 27d56312

crypto/asn1/a_dup.c

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#ifndef NO_OLD_ASN1



void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)

void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, const void *x)

{

    unsigned char *b, *p;

    const unsigned char *p2;
@@ -46,7 +46,7 @@ void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) 
 * decode.

 */



void *ASN1_item_dup(const ASN1_ITEM *it, void *x)

void *ASN1_item_dup(const ASN1_ITEM *it, const void *x)

{

    unsigned char *b = NULL;

    const unsigned char *p;

crypto/asn1/a_i2d_fp.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef NO_OLD_ASN1



# ifndef OPENSSL_NO_STDIO

int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)

int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)

{

    BIO *b;

    int ret;
@@ -31,7 +31,7 @@ int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x) 
}

# endif



int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)

int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x)

{

    char *b;

    unsigned char *p;
@@ -68,7 +68,7 @@ int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x) 
#endif



#ifndef OPENSSL_NO_STDIO

int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)

int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, const void *x)

{

    BIO *b;

    int ret;
@@ -84,7 +84,7 @@ int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x) 
}

#endif



int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x)

int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, const void *x)

{

    unsigned char *b = NULL;

    int i, j = 0, n, ret = 1;

crypto/asn1/asn1_locl.h

+8 −2
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 


/* Internal ASN1 structures and functions: not for application use */



typedef const ASN1_VALUE const_ASN1_VALUE;

SKM_DEFINE_STACK_OF(const_ASN1_VALUE, const ASN1_VALUE, ASN1_VALUE)



int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d);

int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d);

int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);
@@ -46,19 +49,22 @@ DEFINE_STACK_OF(MIME_HEADER) 
void asn1_string_embed_free(ASN1_STRING *a, int embed);



int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);

int asn1_get_choice_selector_const(const 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_VALUE **asn1_get_const_field_ptr(const ASN1_VALUE **pval,

                                            const ASN1_TEMPLATE *tt);



const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,

const ASN1_TEMPLATE *asn1_do_adb(const ASN1_VALUE *val, 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,

int asn1_enc_restore(int *len, unsigned char **out, const 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/asn_mime.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static void mime_hdr_free(MIME_HEADER *hdr); 


/* Output an ASN1 structure in BER format streaming if necessary */



/* unfortunately cannot constify this due to CMS_stream() and PKCS7_stream() */

int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,

                        const ASN1_ITEM *it)

{
@@ -311,6 +312,7 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, 


/* Handle output of ASN1 data */



/* cannot constify val because of CMS_dataFinal() */

static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,

                            const ASN1_ITEM *it)

{

crypto/asn1/bio_ndef.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg); 
static int ndef_suffix_free(BIO *b, unsigned char **pbuf, int *plen,

                            void *parg);



/* unfortunately cannot constify this due to CMS_stream() and PKCS7_stream() */

BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)

{

    NDEF_SUPPORT *ndef_aux = NULL;