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

Constify input parameters of methods : 



 - X509_NAME_entry_count, X509_ATTRIBUTE_count
 - X509_NAME_add_entry_by_OBJ, X509_NAME_ENTRY_create_by_OBJ, X509_NAME_ENTRY_set_object

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 d3d5dc60

crypto/x509/x509_att.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, 
    return 0;

}



int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr)

int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)

{

    if (attr == NULL)

        return 0;

crypto/x509/x509name.c

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf, 
    return (i);

}



int X509_NAME_entry_count(X509_NAME *name)

int X509_NAME_entry_count(const X509_NAME *name)

{

    if (name == NULL)

        return (0);
@@ -130,7 +130,7 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc) 
    return (ret);

}



int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,

int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,

                               unsigned char *bytes, int len, int loc,

                               int set)

{
@@ -270,7 +270,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, 
}



X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,

                                               ASN1_OBJECT *obj, int type,

                                               const ASN1_OBJECT *obj, int type,

                                               const unsigned char *bytes,

                                               int len)

{
@@ -296,7 +296,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, 
    return (NULL);

}



int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj)

int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)

{

    if ((ne == NULL) || (obj == NULL)) {

        X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,

doc/crypto/X509_NAME_ENTRY_get_object.pod

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ X509_NAME_ENTRY_create_by_OBJ - X509_NAME_ENTRY utility functions 
 ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);

 ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);



 int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);

 int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj);

 int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len);



 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len);

 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type, unsigned char *bytes, int len);

 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);

 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, const ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);



=head1 DESCRIPTION

doc/crypto/X509_NAME_add_entry_by_txt.pod

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ X509_NAME_add_entry, X509_NAME_delete_entry - X509_NAME modification functions 


 int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set);



 int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);

 int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);



 int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set);

doc/crypto/X509_NAME_get_index_by_NID.pod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ X509_NAME lookup and enumeration functions 
 int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos);

 int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos);



 int X509_NAME_entry_count(X509_NAME *name);

 int X509_NAME_entry_count(const X509_NAME *name);

 X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);



 int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len);