mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1300)
This commit is contained in:
FdaSilvaYY 2016-07-10 00:37:58 +02:00 committed by Rich Salz
parent fdaf7beec5
commit 7569362ebb
6 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crypto/x509/x509_ext.c
View File

@ -17,22 +17,22 @@
#include "internal/x509_int.h" #include "internal/x509_int.h"
#include <openssl/x509v3.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)); 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)); 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)); 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)); 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); 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)); 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)); 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)); 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 return (X509v3_get_ext_by_critical
(x->cert_info.extensions, crit, lastpos)); (x->cert_info.extensions, crit, lastpos));
@ -111,23 +111,23 @@ int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
flags); 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)); 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)); 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) int lastpos)
{ {
return (X509v3_get_ext_by_OBJ(x->extensions, obj, 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)); return (X509v3_get_ext_by_critical(x->extensions, crit, lastpos));
} }

2
crypto/x509/x509_v3.c
View File

@ -224,7 +224,7 @@ ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex)
return &ex->value; return &ex->value;
} }
int X509_EXTENSION_get_critical(X509_EXTENSION *ex) int X509_EXTENSION_get_critical(const X509_EXTENSION *ex)
{ {
if (ex == NULL) if (ex == NULL)
return (0); return (0);

2
crypto/x509v3/v3_purp.c
View File

@ -720,7 +720,7 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
return 0; return 0;
/* Extended Key Usage MUST be critical */ /* 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) { if (i_ext >= 0) {
X509_EXTENSION *ext = X509_get_ext((X509 *)x, i_ext); X509_EXTENSION *ext = X509_get_ext((X509 *)x, i_ext);
if (!X509_EXTENSION_get_critical(ext)) if (!X509_EXTENSION_get_critical(ext))

2
doc/crypto/X509_EXTENSION_set_object.pod
View File

@ -22,7 +22,7 @@ functions
ASN1_OCTET_STRING *data); ASN1_OCTET_STRING *data);
ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex); 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); ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
=head1 DESCRIPTION =head1 DESCRIPTION

24
doc/crypto/X509v3_get_ext_by_NID.pod
View File

@ -30,28 +30,28 @@ X509_REVOKED_add_ext - extension stack utility functions
STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
X509_EXTENSION *ex, int loc); 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); 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_NID(const X509 *x, int nid, int 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);
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);
X509_EXTENSION *X509_delete_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); 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); 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_NID(const 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_OBJ(const 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_critical(const X509_CRL *x, int crit, int lastpos);
X509_EXTENSION *X509_CRL_delete_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); 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); 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_NID(const 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_OBJ(const X509_REVOKED *x, ASN1_OBJECT *obj,
int lastpos); 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); X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc); int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);

28
include/openssl/x509.h
View File

@ -760,7 +760,7 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
char *buf, int len); char *buf, int len);
/* /*
* NOTE: you should be passsing -1, not 0 as lastpos. The functions that use * NOTE: you should be passing -1, not 0 as lastpos. The functions that use
* lastpos, search after that position on. * lastpos, search after that position on.
*/ */
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos); int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos);
@ -812,10 +812,10 @@ X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
X509_EXTENSION *ex, int loc); X509_EXTENSION *ex, int loc);
int X509_get_ext_count(X509 *x); int X509_get_ext_count(const X509 *x);
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);
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);
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);
X509_EXTENSION *X509_get_ext(X509 *x, int loc); X509_EXTENSION *X509_get_ext(X509 *x, int loc);
X509_EXTENSION *X509_delete_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); int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
@ -823,10 +823,10 @@ 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, int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int X509_CRL_get_ext_count(X509_CRL *x); int X509_CRL_get_ext_count(const X509_CRL *x);
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);
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);
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);
X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc); X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);
X509_EXTENSION *X509_CRL_delete_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); int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
@ -834,11 +834,11 @@ 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, int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
unsigned long flags); unsigned long flags);
int X509_REVOKED_get_ext_count(X509_REVOKED *x); int X509_REVOKED_get_ext_count(const X509_REVOKED *x);
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);
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); 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_get_ext(X509_REVOKED *x, int loc); X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);
X509_EXTENSION *X509_REVOKED_delete_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); int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
@ -857,7 +857,7 @@ int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data); int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data);
ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex); ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex);
ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne); ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
int X509_EXTENSION_get_critical(X509_EXTENSION *ex); int X509_EXTENSION_get_critical(const X509_EXTENSION *ex);
int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,