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

Constify ... X509|X509_CRL|X509_REVOKED|_get_ext*() 



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 fdaf7bee

crypto/x509/x509_ext.c

+12 −12
Original line number Diff line number Diff line
@@ -17,22 +17,22 @@ 
#include "internal/x509_int.h"

#include <openssl/x509v3.h>



int X509_CRL_get_ext_count(X509_CRL *x)

int X509_CRL_get_ext_count(const X509_CRL *x)

{

    return (X509v3_get_ext_count(x->crl.extensions));

}



int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos)

int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID(x->crl.extensions, nid, lastpos));

}



int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos)

int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, ASN1_OBJECT *obj, int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->crl.extensions, obj, lastpos));

}



int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos)

int X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos)

{

    return (X509v3_get_ext_by_critical(x->crl.extensions, crit, lastpos));

}
@@ -63,22 +63,22 @@ int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc) 
    return (X509v3_add_ext(&(x->crl.extensions), ex, loc) != NULL);

}



int X509_get_ext_count(X509 *x)

int X509_get_ext_count(const X509 *x)

{

    return (X509v3_get_ext_count(x->cert_info.extensions));

}



int X509_get_ext_by_NID(X509 *x, int nid, int lastpos)

int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID(x->cert_info.extensions, nid, lastpos));

}



int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos)

int X509_get_ext_by_OBJ(const X509 *x, ASN1_OBJECT *obj, int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->cert_info.extensions, obj, lastpos));

}



int X509_get_ext_by_critical(X509 *x, int crit, int lastpos)

int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos)

{

    return (X509v3_get_ext_by_critical

            (x->cert_info.extensions, crit, lastpos));
@@ -111,23 +111,23 @@ int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit, 
                           flags);

}



int X509_REVOKED_get_ext_count(X509_REVOKED *x)

int X509_REVOKED_get_ext_count(const X509_REVOKED *x)

{

    return (X509v3_get_ext_count(x->extensions));

}



int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos)

int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID(x->extensions, nid, lastpos));

}



int X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x, ASN1_OBJECT *obj,

int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, ASN1_OBJECT *obj,

                                int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos));

}



int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos)

int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpos)

{

    return (X509v3_get_ext_by_critical(x->extensions, crit, lastpos));

}

crypto/x509/x509_v3.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex) 
    return &ex->value;

}



int X509_EXTENSION_get_critical(X509_EXTENSION *ex)

int X509_EXTENSION_get_critical(const X509_EXTENSION *ex)

{

    if (ex == NULL)

        return (0);

crypto/x509v3/v3_purp.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x, 
        return 0;



    /* Extended Key Usage MUST be critical */

    i_ext = X509_get_ext_by_NID((X509 *)x, NID_ext_key_usage, -1);

    i_ext = X509_get_ext_by_NID(x, NID_ext_key_usage, -1);

    if (i_ext >= 0) {

        X509_EXTENSION *ext = X509_get_ext((X509 *)x, i_ext);

        if (!X509_EXTENSION_get_critical(ext))

doc/crypto/X509_EXTENSION_set_object.pod

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ functions 
                                              ASN1_OCTET_STRING *data);



 ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex);

 int X509_EXTENSION_get_critical(X509_EXTENSION *ex);

 int X509_EXTENSION_get_critical(const X509_EXTENSION *ex);

 ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);



=head1 DESCRIPTION

doc/crypto/X509v3_get_ext_by_NID.pod

+12 −12
Original line number Diff line number Diff line
@@ -30,28 +30,28 @@ X509_REVOKED_add_ext - extension stack utility functions 
 STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,

                                          X509_EXTENSION *ex, int loc);



 int X509_get_ext_count(X509 *x);

 int X509_get_ext_count(const X509 *x);

 X509_EXTENSION *X509_get_ext(X509 *x, int loc);

 int X509_get_ext_by_NID(X509 *x, int nid, int lastpos);

 int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos);

 int X509_get_ext_by_critical(X509 *x, int crit, int lastpos);

 int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos);

 int X509_get_ext_by_OBJ(const X509 *x, ASN1_OBJECT *obj, int lastpos);

 int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos);

 X509_EXTENSION *X509_delete_ext(X509 *x, int loc);

 int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);



 int X509_CRL_get_ext_count(X509_CRL *x);

 int X509_CRL_get_ext_count(const X509_CRL *x);

 X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);

 int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);

 int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos);

 int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);

 int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos);

 int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, ASN1_OBJECT *obj, int lastpos);

 int X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos);

 X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);

 int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);



 int X509_REVOKED_get_ext_count(X509_REVOKED *x);

 int X509_REVOKED_get_ext_count(const X509_REVOKED *x);

 X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);

 int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);

 int X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x, ASN1_OBJECT *obj,

 int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos);

 int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, ASN1_OBJECT *obj,

                                int lastpos);

 int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);

 int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpos);

 X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);

 int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);