Commit 08275a29 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Constify ASN1_TYPE_get, ASN1_STRING_type, ASN1_STRING_to_UTF8, ASN1_TYPE_get_octetstring & co... 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1300)
parent 0aa25a68

crypto/asn1/a_strex.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags) 
 * in output string or a negative error code

 */



int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in)

int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in)

{

    ASN1_STRING stmp, *str = &stmp;

    int mbflag, type, ret;

crypto/asn1/a_type.c

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

#include "asn1_locl.h"



int ASN1_TYPE_get(ASN1_TYPE *a)

int ASN1_TYPE_get(const ASN1_TYPE *a)

{

    if ((a->value.ptr != NULL) || (a->type == V_ASN1_NULL))

        return (a->type);

crypto/asn1/asn1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ void ASN1_STRING_length_set(ASN1_STRING *x, int len) 
    x->length = len;

}



int ASN1_STRING_type(ASN1_STRING *x)

int ASN1_STRING_type(const ASN1_STRING *x)

{

    return x->type;

}

crypto/asn1/evp_asn1.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len) 
}



/* int max_len:  for returned value    */

int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len)

int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len)

{

    int ret, num;

    unsigned char *p;
@@ -80,7 +80,7 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, 
 * we return the actual length...

 */

/* int max_len:  for returned value    */

int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,

int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,

                                  unsigned char *data, int max_len)

{

    asn1_int_oct *atmp = NULL;

crypto/x509/x_name.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static void x509_name_ex_free(ASN1_VALUE **val, const ASN1_ITEM *it); 


static int x509_name_encode(X509_NAME *a);

static int x509_name_canon(X509_NAME *a);

static int asn1_string_canon(ASN1_STRING *out, ASN1_STRING *in);

static int asn1_string_canon(ASN1_STRING *out, const ASN1_STRING *in);

static int i2d_name_canon(STACK_OF(STACK_OF_X509_NAME_ENTRY) * intname,

                          unsigned char **in);
@@ -380,7 +380,7 @@ static int x509_name_canon(X509_NAME *a) 
        | B_ASN1_PRINTABLESTRING | B_ASN1_T61STRING | B_ASN1_IA5STRING \

        | B_ASN1_VISIBLESTRING)



static int asn1_string_canon(ASN1_STRING *out, ASN1_STRING *in)

static int asn1_string_canon(ASN1_STRING *out, const ASN1_STRING *in)

{

    unsigned char *to, *from;

    int len, i;