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

Constify (X509|X509V3|X509_CRL|X509_REVOKED)_get_ext_d2i ... 



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 a6a283b3

crypto/x509/x509_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc) 
    return (X509v3_delete_ext(x->crl.extensions, loc));

}



void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx)

void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx)

{

    return X509V3_get_d2i(x->crl.extensions, nid, crit, idx);

}
@@ -99,7 +99,7 @@ int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc) 
    return (X509v3_add_ext(&(x->cert_info.extensions), ex, loc) != NULL);

}



void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)

void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx)

{

    return X509V3_get_d2i(x->cert_info.extensions, nid, crit, idx);

}
@@ -147,7 +147,7 @@ int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc) 
    return (X509v3_add_ext(&(x->extensions), ex, loc) != NULL);

}



void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx)

void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit, int *idx)

{

    return X509V3_get_d2i(x->extensions, nid, crit, idx);

}

crypto/x509v3/v3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext) 
 * -2 extension occurs more than once.

 */



void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

                     int *idx)

{

    int lastpos, i;

doc/crypto/X509V3_get_d2i.pod

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ X509_REVOKED_add1_ext_i2d - X509 extension decode and encode functions 


 #include <openssl/x509v3.h>



 void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

 void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

                      int *idx);

 int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,

                     int crit, unsigned long flags);
@@ -20,15 +20,15 @@ X509_REVOKED_add1_ext_i2d - X509 extension decode and encode functions 
 void *X509V3_EXT_d2i(X509_EXTENSION *ext);

 X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext);



 void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);

 void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx);

 int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,

                       unsigned long flags);



 void *X509_CRL_get_ext_d2i(X509_CRL *crl, int nid, int *crit, int *idx);

 void *X509_CRL_get_ext_d2i(const X509_CRL *crl, int nid, int *crit, int *idx);

 int X509_CRL_add1_ext_i2d(X509_CRL *crl, int nid, void *value, int crit,

                           unsigned long flags);



 void *X509_REVOKED_get_ext_d2i(X509_REVOKED *r, int nid, int *crit, int *idx);

 void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *r, int nid, int *crit, int *idx);

 int X509_REVOKED_add1_ext_i2d(X509_REVOKED *r, int nid, void *value, int crit,

                               unsigned long flags);

include/openssl/x509.h

+3 −3
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ int X509_get_ext_by_critical(X509 *x, int crit, int lastpos); 
X509_EXTENSION *X509_get_ext(X509 *x, int loc);

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

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

void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);

void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx);

int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,

                      unsigned long flags);
@@ -830,7 +830,7 @@ int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos); 
X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);

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

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

void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx);

void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx);

int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,

                          unsigned long flags);
@@ -842,7 +842,7 @@ int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos); 
X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);

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

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

void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);

void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit, int *idx);

int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,

                              unsigned long flags);

include/openssl/x509v3.h

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid); 
int X509V3_add_standard_extensions(void);

STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);

void *X509V3_EXT_d2i(X509_EXTENSION *ext);

void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,

                     int *idx);



X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);