generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the X509V3_*_d2i functions to X509_get_ext_d2i() etc.

Browse Source 
This better reflects their behaviour.
This commit is contained in:
Dr. Stephen Henson 2000-02-07 01:17:22 +00:00
parent 4e539aaa1e
commit ff8a4c47ce
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/x509/x509.h
View File

@ -1011,6 +1011,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_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);
void * X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
int X509_CRL_get_ext_count(X509_CRL *x); int X509_CRL_get_ext_count(X509_CRL *x);
int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos); int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
@ -1019,6 +1020,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_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);
void * X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx);
int X509_REVOKED_get_ext_count(X509_REVOKED *x); int X509_REVOKED_get_ext_count(X509_REVOKED *x);
int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos); int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
@ -1027,6 +1029,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_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);
void * X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);
X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
int nid, int crit, ASN1_OCTET_STRING *data); int nid, int crit, ASN1_OCTET_STRING *data);

17
crypto/x509/x509_ext.c
View File

@ -63,6 +63,8 @@
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/x509v3.h>
int X509_CRL_get_ext_count(X509_CRL *x) int X509_CRL_get_ext_count(X509_CRL *x)
{ {
@ -94,6 +96,11 @@ X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
return(X509v3_delete_ext(x->crl->extensions,loc)); return(X509v3_delete_ext(x->crl->extensions,loc));
} }
void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->crl->extensions, nid, crit, idx);
}
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)
{ {
return(X509v3_add_ext(&(x->crl->extensions),ex,loc) != NULL); return(X509v3_add_ext(&(x->crl->extensions),ex,loc) != NULL);
@ -134,6 +141,11 @@ int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
return(X509v3_add_ext(&(x->cert_info->extensions),ex,loc) != NULL); return(X509v3_add_ext(&(x->cert_info->extensions),ex,loc) != NULL);
} }
void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->cert_info->extensions, nid, crit, idx);
}
int X509_REVOKED_get_ext_count(X509_REVOKED *x) int X509_REVOKED_get_ext_count(X509_REVOKED *x)
{ {
return(X509v3_get_ext_count(x->extensions)); return(X509v3_get_ext_count(x->extensions));
@ -170,5 +182,10 @@ int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
return(X509v3_add_ext(&(x->extensions),ex,loc) != NULL); return(X509v3_add_ext(&(x->extensions),ex,loc) != NULL);
} }
void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->extensions, nid, crit, idx);
}
IMPLEMENT_STACK_OF(X509_EXTENSION) IMPLEMENT_STACK_OF(X509_EXTENSION)
IMPLEMENT_ASN1_SET_OF(X509_EXTENSION) IMPLEMENT_ASN1_SET_OF(X509_EXTENSION)

17
crypto/x509v3/v3_lib.c
View File

@ -219,20 +219,3 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
if(crit) *crit = -1; if(crit) *crit = -1;
return NULL; return NULL;
} }
/* As above but for a passed certificate */
void *X509V3_X509_get_d2i(X509 *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->cert_info->extensions, nid, crit, idx);
}
void *X509V3_CRL_get_d2i(X509_CRL *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->crl->extensions, nid, crit, idx);
}
void *X509V3_REVOKED_get_d2i(X509_REVOKED *x, int nid, int *crit, int *idx)
{
return X509V3_get_d2i(x->extensions, nid, crit, idx);
}

8
crypto/x509v3/v3_purp.c
View File

@ -263,7 +263,7 @@ static void x509v3_cache_extensions(X509 *x)
/* V1 should mean no extensions ... */ /* V1 should mean no extensions ... */
if(!X509_get_version(x)) x->ex_flags |= EXFLAG_V1; if(!X509_get_version(x)) x->ex_flags |= EXFLAG_V1;
/* Handle basic constraints */ /* Handle basic constraints */
if((bs=X509V3_X509_get_d2i(x, NID_basic_constraints, NULL, NULL))) { if((bs=X509_get_ext_d2i(x, NID_basic_constraints, NULL, NULL))) {
if(bs->ca) x->ex_flags |= EXFLAG_CA; if(bs->ca) x->ex_flags |= EXFLAG_CA;
if(bs->pathlen) { if(bs->pathlen) {
if((bs->pathlen->type == V_ASN1_NEG_INTEGER) if((bs->pathlen->type == V_ASN1_NEG_INTEGER)
@ -276,7 +276,7 @@ static void x509v3_cache_extensions(X509 *x)
x->ex_flags |= EXFLAG_BCONS; x->ex_flags |= EXFLAG_BCONS;
} }
/* Handle key usage */ /* Handle key usage */
if((usage=X509V3_X509_get_d2i(x, NID_key_usage, NULL, NULL))) { if((usage=X509_get_ext_d2i(x, NID_key_usage, NULL, NULL))) {
if(usage->length > 0) { if(usage->length > 0) {
x->ex_kusage = usage->data[0]; x->ex_kusage = usage->data[0];
if(usage->length > 1) if(usage->length > 1)
@ -286,7 +286,7 @@ static void x509v3_cache_extensions(X509 *x)
ASN1_BIT_STRING_free(usage); ASN1_BIT_STRING_free(usage);
} }
x->ex_xkusage = 0; x->ex_xkusage = 0;
if((extusage=X509V3_X509_get_d2i(x, NID_ext_key_usage, NULL, NULL))) { if((extusage=X509_get_ext_d2i(x, NID_ext_key_usage, NULL, NULL))) {
x->ex_flags |= EXFLAG_XKUSAGE; x->ex_flags |= EXFLAG_XKUSAGE;
for(i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) { for(i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) {
switch(OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage,i))) { switch(OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage,i))) {
@ -314,7 +314,7 @@ static void x509v3_cache_extensions(X509 *x)
sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free);
} }
if((ns=X509V3_X509_get_d2i(x, NID_netscape_cert_type, NULL, NULL))) { if((ns=X509_get_ext_d2i(x, NID_netscape_cert_type, NULL, NULL))) {
if(ns->length > 0) x->ex_nscert = ns->data[0]; if(ns->length > 0) x->ex_nscert = ns->data[0];
else x->ex_nscert = 0; else x->ex_nscert = 0;
x->ex_flags |= EXFLAG_NSCERT; x->ex_flags |= EXFLAG_NSCERT;

3
crypto/x509v3/x509v3.h
View File

@ -515,9 +515,6 @@ int X509V3_add_standard_extensions(void);
STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line); STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line);
void *X509V3_EXT_d2i(X509_EXTENSION *ext); void *X509V3_EXT_d2i(X509_EXTENSION *ext);
void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx); void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx);
void *X509V3_X509_get_d2i(X509 *x, int nid, int *crit, int *idx);
void *X509V3_CRL_get_d2i(X509_CRL *x, int nid, int *crit, int *idx);
void *X509V3_REVOKED_get_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);
X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc); X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);

6
util/libeay.num
View File

@ -1881,7 +1881,7 @@ ASN1_tag2str 1905
BIO_ctrl_reset_read_request 1906 BIO_ctrl_reset_read_request 1906
DISPLAYTEXT_new 1907 DISPLAYTEXT_new 1907
ASN1_GENERALIZEDTIME_free 1908 ASN1_GENERALIZEDTIME_free 1908
X509V3_REVOKED_get_d2i 1909 X509_REVOKED_get_ext_d2i 1909
X509_set_ex_data 1910 X509_set_ex_data 1910
X509_reject_set_bit_asc 1911 X509_reject_set_bit_asc 1911
X509_NAME_add_entry_by_txt 1912 X509_NAME_add_entry_by_txt 1912
@ -1930,7 +1930,7 @@ ASN1_TIME_free 1954
ASN1_OCTET_STRING_cmp 1955 ASN1_OCTET_STRING_cmp 1955
sk_ACCESS_DESCRIPTION_value 1956 sk_ACCESS_DESCRIPTION_value 1956
ASN1_BIT_STRING_new 1957 ASN1_BIT_STRING_new 1957
X509V3_X509_get_d2i 1958 X509_get_ext_d2i 1958
PEM_read_bio_X509_AUX 1959 PEM_read_bio_X509_AUX 1959
ASN1_STRING_set_default_mask_asc 1960 ASN1_STRING_set_default_mask_asc 1960
PEM_write_bio_RSA_PUBKEY 1961 PEM_write_bio_RSA_PUBKEY 1961
@ -1981,7 +1981,7 @@ sk_X509_TRUST_shift 2005
sk_ACCESS_DESCRIPTION_zero 2006 sk_ACCESS_DESCRIPTION_zero 2006
X509_TRUST_cleanup 2007 X509_TRUST_cleanup 2007
X509_NAME_add_entry_by_OBJ 2008 X509_NAME_add_entry_by_OBJ 2008
X509V3_CRL_get_d2i 2009 X509_CRL_get_ext_d2i 2009
sk_X509_TRUST_set 2010 sk_X509_TRUST_set 2010
X509_PURPOSE_iget_name 2011 X509_PURPOSE_iget_name 2011
PEM_read_PUBKEY 2012 PEM_read_PUBKEY 2012