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

Constify input buffers of some X509V3 and X509_PURPOSE -related methods 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)
parent 82643254

crypto/x509v3/v3_alt.c

+5 −5
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method, 
                                     STACK_OF(CONF_VALUE) *nval);

static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);

static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);

static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);

static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx);

static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);

static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);



const X509V3_EXT_METHOD v3_alt[3] = {

    {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
@@ -382,7 +382,7 @@ GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method, 


GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,

                               const X509V3_EXT_METHOD *method,

                               X509V3_CTX *ctx, int gen_type, char *value,

                               X509V3_CTX *ctx, int gen_type, const char *value,

                               int is_nc)

{

    char is_string = 0;
@@ -511,7 +511,7 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out, 


}



static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)

static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)

{

    char *objtmp = NULL, *p;

    int objlen;
@@ -538,7 +538,7 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx) 
    return 1;

}



static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)

static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)

{

    int ret = 0;

    STACK_OF(CONF_VALUE) *sk = NULL;

crypto/x509v3/v3_conf.c

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section, 


/* Config database functions */



char *X509V3_get_string(X509V3_CTX *ctx, char *name, char *section)

char *X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section)

{

    if (!ctx->db || !ctx->db_meth || !ctx->db_meth->get_string) {

        X509V3err(X509V3_F_X509V3_GET_STRING, X509V3_R_OPERATION_NOT_DEFINED);
@@ -374,7 +374,7 @@ char *X509V3_get_string(X509V3_CTX *ctx, char *name, char *section) 
    return NULL;

}



STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, char *section)

STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section)

{

    if (!ctx->db || !ctx->db_meth || !ctx->db_meth->get_section) {

        X509V3err(X509V3_F_X509V3_GET_SECTION,

crypto/x509v3/v3_cpols.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,

                       BIO *out, int indent);

static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,

                                         X509V3_CTX *ctx, char *value);

                                         X509V3_CTX *ctx, const char *value);

static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,

                             int indent);

static void print_notice(BIO *out, USERNOTICE *notice, int indent);
@@ -84,7 +84,7 @@ ASN1_SEQUENCE(NOTICEREF) = { 
IMPLEMENT_ASN1_FUNCTIONS(NOTICEREF)



static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,

                                         X509V3_CTX *ctx, char *value)

                                         X509V3_CTX *ctx, const char *value)

{

    STACK_OF(POLICYINFO) *pols = NULL;

    char *pstr;

crypto/x509v3/v3_int.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ const X509V3_EXT_METHOD v3_delta_crl = { 
};



static void *s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx,

                          char *value)

                          const char *value)

{

    return s2i_ASN1_INTEGER(meth, value);

}

crypto/x509v3/v3_ncons.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a, 
                                BIO *bp, int ind);

static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,

                                   STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp,

                                   int ind, char *name);

                                   int ind, const char *name);

static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);



static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc);
@@ -122,7 +122,7 @@ static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a, 


static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,

                                   STACK_OF(GENERAL_SUBTREE) *trees,

                                   BIO *bp, int ind, char *name)

                                   BIO *bp, int ind, const char *name)

{

    GENERAL_SUBTREE *tree;

    int i;