From c7d13c138c0aaaa6bff867b5137cf1e74950f53a Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Sun, 10 Jul 2016 00:59:23 +0200 Subject: [PATCH] Constify X509|X509_CRL|X509_REVOKED_get_ext Reviewed-by: Matt Caswell Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1300) --- crypto/x509/x509_ext.c | 6 +++--- doc/crypto/X509v3_get_ext_by_NID.pod | 6 +++--- include/openssl/x509.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index 9e6fa6b5a5..55a95d9d3c 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -37,7 +37,7 @@ 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)); } -X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc) +X509_EXTENSION *X509_CRL_get_ext(const X509_CRL *x, int loc) { return (X509v3_get_ext(x->crl.extensions, loc)); } @@ -84,7 +84,7 @@ int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos) (x->cert_info.extensions, crit, lastpos)); } -X509_EXTENSION *X509_get_ext(X509 *x, int loc) +X509_EXTENSION *X509_get_ext(const X509 *x, int loc) { return (X509v3_get_ext(x->cert_info.extensions, loc)); } @@ -132,7 +132,7 @@ int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpo return (X509v3_get_ext_by_critical(x->extensions, crit, lastpos)); } -X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc) +X509_EXTENSION *X509_REVOKED_get_ext(const X509_REVOKED *x, int loc) { return (X509v3_get_ext(x->extensions, loc)); } diff --git a/doc/crypto/X509v3_get_ext_by_NID.pod b/doc/crypto/X509v3_get_ext_by_NID.pod index fefdf9e5d6..eeb5155737 100644 --- a/doc/crypto/X509v3_get_ext_by_NID.pod +++ b/doc/crypto/X509v3_get_ext_by_NID.pod @@ -31,7 +31,7 @@ X509_REVOKED_add_ext - extension stack utility functions X509_EXTENSION *ex, int loc); int X509_get_ext_count(const X509 *x); - X509_EXTENSION *X509_get_ext(X509 *x, int loc); + X509_EXTENSION *X509_get_ext(const X509 *x, int loc); 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); @@ -39,7 +39,7 @@ X509_REVOKED_add_ext - extension stack utility functions int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc); int X509_CRL_get_ext_count(const X509_CRL *x); - X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc); + X509_EXTENSION *X509_CRL_get_ext(const X509_CRL *x, int loc); 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); @@ -47,7 +47,7 @@ X509_REVOKED_add_ext - extension stack utility functions int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc); int X509_REVOKED_get_ext_count(const X509_REVOKED *x); - X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc); + X509_EXTENSION *X509_REVOKED_get_ext(const X509_REVOKED *x, int loc); 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); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 2b4418029b..7546895fca 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -816,7 +816,7 @@ int X509_get_ext_count(const X509 *x); 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_get_ext(X509 *x, int loc); +X509_EXTENSION *X509_get_ext(const 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(const X509 *x, int nid, int *crit, int *idx); @@ -827,7 +827,7 @@ int X509_CRL_get_ext_count(const X509_CRL *x); 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_get_ext(X509_CRL *x, int loc); +X509_EXTENSION *X509_CRL_get_ext(const 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(const X509_CRL *x, int nid, int *crit, int *idx); @@ -839,7 +839,7 @@ 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(const X509_REVOKED *x, int crit, int lastpos); -X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc); +X509_EXTENSION *X509_REVOKED_get_ext(const 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(const X509_REVOKED *x, int nid, int *crit, int *idx); -- 2.25.1