mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ossl_v3 symbols

Browse Source 
Partial fix for #12964

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
This commit is contained in:
Shane Lontis 2021-03-09 10:52:15 +10:00
parent 4158b0dc1d
commit 47864aeafd
32 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/ct/ct_local.h
View File

@ -219,4 +219,4 @@ __owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);
/*
* Handlers for Certificate Transparency X509v3/OCSP extensions
*/
extern const X509V3_EXT_METHOD v3_ct_scts[3];
extern const X509V3_EXT_METHOD ossl_v3_ct_scts[3];

2
crypto/ct/ct_x509v3.c
View File

@ -75,7 +75,7 @@ static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
}
/* Handlers for X509v3/OCSP Certificate Transparency extensions */
const X509V3_EXT_METHOD v3_ct_scts[3] = {
const X509V3_EXT_METHOD ossl_v3_ct_scts[3] = {
/* X509v3 extension in certificates that contains SCTs */
{ NID_ct_precert_scts, 0, NULL,
NULL, (X509V3_EXT_FREE)SCT_LIST_free,

14
crypto/ocsp/v3_ocsp.c
View File

@ -41,7 +41,7 @@ static void *s2i_ocsp_nocheck(const X509V3_EXT_METHOD *method,
static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
BIO *bp, int ind);
const X509V3_EXT_METHOD v3_ocsp_crlid = {
const X509V3_EXT_METHOD ossl_v3_ocsp_crlid = {
NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID),
0, 0, 0, 0,
0, 0,
@ -50,7 +50,7 @@ const X509V3_EXT_METHOD v3_ocsp_crlid = {
NULL
};
const X509V3_EXT_METHOD v3_ocsp_acutoff = {
const X509V3_EXT_METHOD ossl_v3_ocsp_acutoff = {
NID_id_pkix_OCSP_archiveCutoff, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0, 0, 0, 0,
0, 0,
@ -59,7 +59,7 @@ const X509V3_EXT_METHOD v3_ocsp_acutoff = {
NULL
};
const X509V3_EXT_METHOD v3_crl_invdate = {
const X509V3_EXT_METHOD ossl_v3_crl_invdate = {
NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
0, 0, 0, 0,
0, 0,
@ -68,7 +68,7 @@ const X509V3_EXT_METHOD v3_crl_invdate = {
NULL
};
const X509V3_EXT_METHOD v3_crl_hold = {
const X509V3_EXT_METHOD ossl_v3_crl_hold = {
NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT),
0, 0, 0, 0,
0, 0,
@ -77,7 +77,7 @@ const X509V3_EXT_METHOD v3_crl_hold = {
NULL
};
const X509V3_EXT_METHOD v3_ocsp_nonce = {
const X509V3_EXT_METHOD ossl_v3_ocsp_nonce = {
NID_id_pkix_OCSP_Nonce, 0, NULL,
ocsp_nonce_new,
ocsp_nonce_free,
@ -89,7 +89,7 @@ const X509V3_EXT_METHOD v3_ocsp_nonce = {
NULL
};
const X509V3_EXT_METHOD v3_ocsp_nocheck = {
const X509V3_EXT_METHOD ossl_v3_ocsp_nocheck = {
NID_id_pkix_OCSP_noCheck, 0, ASN1_ITEM_ref(ASN1_NULL),
0, 0, 0, 0,
0, s2i_ocsp_nocheck,
@ -98,7 +98,7 @@ const X509V3_EXT_METHOD v3_ocsp_nocheck = {
NULL
};
const X509V3_EXT_METHOD v3_ocsp_serviceloc = {
const X509V3_EXT_METHOD ossl_v3_ocsp_serviceloc = {
NID_id_pkix_OCSP_serviceLocator, 0, ASN1_ITEM_ref(OCSP_SERVICELOC),
0, 0, 0, 0,
0, 0,

34
crypto/x509/ext_dat.h
View File

@ -7,21 +7,21 @@
* https://www.openssl.org/source/license.html
*/
int v3_name_cmp(const char *name, const char *cmp);
int ossl_v3_name_cmp(const char *name, const char *cmp);
extern const X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
extern const X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo;
extern const X509V3_EXT_METHOD v3_ns_ia5_list[8], v3_alt[3], v3_skey_id, v3_akey_id;
extern const X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate;
extern const X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl;
extern const X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff;
extern const X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc;
extern const X509V3_EXT_METHOD v3_crl_hold, v3_pci;
extern const X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;
extern const X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp;
extern const X509V3_EXT_METHOD v3_addr, v3_asid;
extern const X509V3_EXT_METHOD v3_ct_scts[3];
extern const X509V3_EXT_METHOD v3_tls_feature;
extern const X509V3_EXT_METHOD v3_ext_admission;
extern const X509V3_EXT_METHOD v3_utf8_list[1];
extern const X509V3_EXT_METHOD v3_issuer_sign_tool;
extern const X509V3_EXT_METHOD ossl_v3_bcons, ossl_v3_nscert, ossl_v3_key_usage, ossl_v3_ext_ku;
extern const X509V3_EXT_METHOD ossl_v3_pkey_usage_period, ossl_v3_sxnet, ossl_v3_info, ossl_v3_sinfo;
extern const X509V3_EXT_METHOD ossl_v3_ns_ia5_list[8], ossl_v3_alt[3], ossl_v3_skey_id, ossl_v3_akey_id;
extern const X509V3_EXT_METHOD ossl_v3_crl_num, ossl_v3_crl_reason, ossl_v3_crl_invdate;
extern const X509V3_EXT_METHOD ossl_v3_delta_crl, ossl_v3_cpols, ossl_v3_crld, ossl_v3_freshest_crl;
extern const X509V3_EXT_METHOD ossl_v3_ocsp_nonce, ossl_v3_ocsp_accresp, ossl_v3_ocsp_acutoff;
extern const X509V3_EXT_METHOD ossl_v3_ocsp_crlid, ossl_v3_ocsp_nocheck, ossl_v3_ocsp_serviceloc;
extern const X509V3_EXT_METHOD ossl_v3_crl_hold, ossl_v3_pci;
extern const X509V3_EXT_METHOD ossl_v3_policy_mappings, ossl_v3_policy_constraints;
extern const X509V3_EXT_METHOD ossl_v3_name_constraints, ossl_v3_inhibit_anyp, ossl_v3_idp;
extern const X509V3_EXT_METHOD ossl_v3_addr, ossl_v3_asid;
extern const X509V3_EXT_METHOD ossl_v3_ct_scts[3];
extern const X509V3_EXT_METHOD ossl_v3_tls_feature;
extern const X509V3_EXT_METHOD ossl_v3_ext_admission;
extern const X509V3_EXT_METHOD ossl_v3_utf8_list[1];
extern const X509V3_EXT_METHOD ossl_v3_issuer_sign_tool;

98
crypto/x509/standard_exts.h
View File

@ -13,65 +13,65 @@
*/
static const X509V3_EXT_METHOD *standard_exts[] = {
&v3_nscert,
&v3_ns_ia5_list[0],
&v3_ns_ia5_list[1],
&v3_ns_ia5_list[2],
&v3_ns_ia5_list[3],
&v3_ns_ia5_list[4],
&v3_ns_ia5_list[5],
&v3_ns_ia5_list[6],
&v3_skey_id,
&v3_key_usage,
&v3_pkey_usage_period,
&v3_alt[0],
&v3_alt[1],
&v3_bcons,
&v3_crl_num,
&v3_cpols,
&v3_akey_id,
&v3_crld,
&v3_ext_ku,
&v3_delta_crl,
&v3_crl_reason,
&ossl_v3_nscert,
&ossl_v3_ns_ia5_list[0],
&ossl_v3_ns_ia5_list[1],
&ossl_v3_ns_ia5_list[2],
&ossl_v3_ns_ia5_list[3],
&ossl_v3_ns_ia5_list[4],
&ossl_v3_ns_ia5_list[5],
&ossl_v3_ns_ia5_list[6],
&ossl_v3_skey_id,
&ossl_v3_key_usage,
&ossl_v3_pkey_usage_period,
&ossl_v3_alt[0],
&ossl_v3_alt[1],
&ossl_v3_bcons,
&ossl_v3_crl_num,
&ossl_v3_cpols,
&ossl_v3_akey_id,
&ossl_v3_crld,
&ossl_v3_ext_ku,
&ossl_v3_delta_crl,
&ossl_v3_crl_reason,
#ifndef OPENSSL_NO_OCSP
&v3_crl_invdate,
&ossl_v3_crl_invdate,
#endif
&v3_sxnet,
&v3_info,
&ossl_v3_sxnet,
&ossl_v3_info,
#ifndef OPENSSL_NO_RFC3779
&v3_addr,
&v3_asid,
&ossl_v3_addr,
&ossl_v3_asid,
#endif
#ifndef OPENSSL_NO_OCSP
&v3_ocsp_nonce,
&v3_ocsp_crlid,
&v3_ocsp_accresp,
&v3_ocsp_nocheck,
&v3_ocsp_acutoff,
&v3_ocsp_serviceloc,
&ossl_v3_ocsp_nonce,
&ossl_v3_ocsp_crlid,
&ossl_v3_ocsp_accresp,
&ossl_v3_ocsp_nocheck,
&ossl_v3_ocsp_acutoff,
&ossl_v3_ocsp_serviceloc,
#endif
&v3_sinfo,
&v3_policy_constraints,
&ossl_v3_sinfo,
&ossl_v3_policy_constraints,
#ifndef OPENSSL_NO_OCSP
&v3_crl_hold,
&ossl_v3_crl_hold,
#endif
&v3_pci,
&v3_name_constraints,
&v3_policy_mappings,
&v3_inhibit_anyp,
&v3_idp,
&v3_alt[2],
&v3_freshest_crl,
&ossl_v3_pci,
&ossl_v3_name_constraints,
&ossl_v3_policy_mappings,
&ossl_v3_inhibit_anyp,
&ossl_v3_idp,
&ossl_v3_alt[2],
&ossl_v3_freshest_crl,
#ifndef OPENSSL_NO_CT
&v3_ct_scts[0],
&v3_ct_scts[1],
&v3_ct_scts[2],
&ossl_v3_ct_scts[0],
&ossl_v3_ct_scts[1],
&ossl_v3_ct_scts[2],
#endif
&v3_utf8_list[0],
&v3_issuer_sign_tool,
&v3_tls_feature,
&v3_ext_admission
&ossl_v3_utf8_list[0],
&ossl_v3_issuer_sign_tool,
&ossl_v3_tls_feature,
&ossl_v3_ext_admission
};
/* Number of standard extensions */

14
crypto/x509/v3_addr.c
View File

@ -908,14 +908,14 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
const char *addr_chars = NULL;
int prefixlen, i1, i2, delim, length;
if (!v3_name_cmp(val->name, "IPv4")) {
if (!ossl_v3_name_cmp(val->name, "IPv4")) {
afi = IANA_AFI_IPV4;
} else if (!v3_name_cmp(val->name, "IPv6")) {
} else if (!ossl_v3_name_cmp(val->name, "IPv6")) {
afi = IANA_AFI_IPV6;
} else if (!v3_name_cmp(val->name, "IPv4-SAFI")) {
} else if (!ossl_v3_name_cmp(val->name, "IPv4-SAFI")) {
afi = IANA_AFI_IPV4;
safi = &safi_;
} else if (!v3_name_cmp(val->name, "IPv6-SAFI")) {
} else if (!ossl_v3_name_cmp(val->name, "IPv6-SAFI")) {
afi = IANA_AFI_IPV6;
safi = &safi_;
} else {
@ -977,7 +977,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
delim = s[i2++];
s[i1] = '\0';
if (a2i_ipadd(min, s) != length) {
if (ossl_a2i_ipadd(min, s) != length) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_IPADDRESS);
X509V3_conf_add_error_name_value(val);
goto err;
@ -1004,7 +1004,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
X509V3_conf_add_error_name_value(val);
goto err;
}
if (a2i_ipadd(max, s + i1) != length) {
if (ossl_a2i_ipadd(max, s + i1) != length) {
ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_IPADDRESS);
X509V3_conf_add_error_name_value(val);
goto err;
@ -1051,7 +1051,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
/*
* OpenSSL dispatch
*/
const X509V3_EXT_METHOD v3_addr = {
const X509V3_EXT_METHOD ossl_v3_addr = {
NID_sbgp_ipAddrBlock, /* nid */
0, /* flags */
ASN1_ITEM_ref(IPAddrBlocks), /* template */

2
crypto/x509/v3_admis.c
View File

@ -53,7 +53,7 @@ IMPLEMENT_ASN1_FUNCTIONS(ADMISSION_SYNTAX)
static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
BIO *bp, int ind);
const X509V3_EXT_METHOD v3_ext_admission = {
const X509V3_EXT_METHOD ossl_v3_ext_admission = {
NID_x509ExtAdmission, /* .ext_nid = */
0, /* .ext_flags = */
ASN1_ITEM_ref(ADMISSION_SYNTAX), /* .it = */

4
crypto/x509/v3_akid.c
View File

@ -24,7 +24,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD v3_akey_id = {
const X509V3_EXT_METHOD ossl_v3_akey_id = {
NID_authority_key_identifier,
X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
0, 0, 0, 0,
@ -136,7 +136,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
X509_PUBKEY *pubkey = NULL;
if (X509_PUBKEY_set(&pubkey, ctx->issuer_pkey))
ikeyid = x509_pubkey_hash(pubkey);
ikeyid = ossl_x509_pubkey_hash(pubkey);
X509_PUBKEY_free(pubkey);
}
if ((keyid == 2 || issuer == 0)

6
crypto/x509/v3_asid.c
View File

@ -528,9 +528,9 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
/*
* Figure out whether this is an AS or an RDI.
*/
if (!v3_name_cmp(val->name, "AS")) {
if (!ossl_v3_name_cmp(val->name, "AS")) {
which = V3_ASID_ASNUM;
} else if (!v3_name_cmp(val->name, "RDI")) {
} else if (!ossl_v3_name_cmp(val->name, "RDI")) {
which = V3_ASID_RDI;
} else {
ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_NAME_ERROR);
@ -624,7 +624,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
/*
* OpenSSL dispatch.
*/
const X509V3_EXT_METHOD v3_asid = {
const X509V3_EXT_METHOD ossl_v3_asid = {
NID_sbgp_autonomousSysNum, /* nid */
0, /* flags */
ASN1_ITEM_ref(ASIdentifiers), /* template */

2
crypto/x509/v3_bcons.c
View File

@ -24,7 +24,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD v3_bcons = {
const X509V3_EXT_METHOD ossl_v3_bcons = {
NID_basic_constraints, 0,
ASN1_ITEM_ref(BASIC_CONSTRAINTS),
0, 0, 0, 0,

4
crypto/x509/v3_bitst.c
View File

@ -38,9 +38,9 @@ static BIT_STRING_BITNAME key_usage_type_table[] = {
{-1, NULL, NULL}
};
const X509V3_EXT_METHOD v3_nscert =
const X509V3_EXT_METHOD ossl_v3_nscert =
EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
const X509V3_EXT_METHOD v3_key_usage =
const X509V3_EXT_METHOD ossl_v3_key_usage =
EXT_BITSTRING(NID_key_usage, key_usage_type_table);
STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,

6
crypto/x509/v3_cpols.c
View File

@ -35,7 +35,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
static int displaytext_str2tag(const char *tagstr, unsigned int *tag_len);
static int displaytext_get_tag_len(const char *tagstr);
const X509V3_EXT_METHOD v3_cpols = {
const X509V3_EXT_METHOD ossl_v3_cpols = {
NID_certificate_policies, 0, ASN1_ITEM_ref(CERTIFICATEPOLICIES),
0, 0, 0, 0,
0, 0,
@ -185,7 +185,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
}
pol->policyid = pobj;
} else if (!v3_name_cmp(cnf->name, "CPS")) {
} else if (!ossl_v3_name_cmp(cnf->name, "CPS")) {
if (pol->qualifiers == NULL)
pol->qualifiers = sk_POLICYQUALINFO_new_null();
if ((qual = POLICYQUALINFO_new()) == NULL)
@ -201,7 +201,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
strlen(cnf->value)))
goto merr;
} else if (!v3_name_cmp(cnf->name, "userNotice")) {
} else if (!ossl_v3_name_cmp(cnf->name, "userNotice")) {
STACK_OF(CONF_VALUE) *unot;
if (*cnf->value != '@') {
ERR_raise(ERR_LIB_X509V3, X509V3_R_EXPECTED_A_SECTION_NAME);

6
crypto/x509/v3_crld.c
View File

@ -23,7 +23,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
int indent);
const X509V3_EXT_METHOD v3_crld = {
const X509V3_EXT_METHOD ossl_v3_crld = {
NID_crl_distribution_points, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
0, 0, 0, 0,
0, 0,
@ -33,7 +33,7 @@ const X509V3_EXT_METHOD v3_crld = {
NULL
};
const X509V3_EXT_METHOD v3_freshest_crl = {
const X509V3_EXT_METHOD ossl_v3_freshest_crl = {
NID_freshest_crl, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
0, 0, 0, 0,
0, 0,
@ -344,7 +344,7 @@ static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *nval);
const X509V3_EXT_METHOD v3_idp = {
const X509V3_EXT_METHOD ossl_v3_idp = {
NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(ISSUING_DIST_POINT),
0, 0, 0, 0,

2
crypto/x509/v3_enum.c
View File

@ -29,7 +29,7 @@ static ENUMERATED_NAMES crl_reasons[] = {
{-1, NULL, NULL}
};
const X509V3_EXT_METHOD v3_crl_reason = {
const X509V3_EXT_METHOD ossl_v3_crl_reason = {
NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED),
0, 0, 0, 0,
(X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,

4
crypto/x509/v3_extku.c
View File

@ -21,7 +21,7 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
*method, void *eku, STACK_OF(CONF_VALUE)
*extlist);
const X509V3_EXT_METHOD v3_ext_ku = {
const X509V3_EXT_METHOD ossl_v3_ext_ku = {
NID_ext_key_usage, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0, 0, 0, 0,
@ -33,7 +33,7 @@ const X509V3_EXT_METHOD v3_ext_ku = {
};
/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
const X509V3_EXT_METHOD v3_ocsp_accresp = {
const X509V3_EXT_METHOD ossl_v3_ocsp_accresp = {
NID_id_pkix_OCSP_acceptableResponses, 0,
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
0, 0, 0, 0,

2
crypto/x509/v3_ia5.c
View File

@ -14,7 +14,7 @@
#include <openssl/x509v3.h>
#include "ext_dat.h"
const X509V3_EXT_METHOD v3_ns_ia5_list[8] = {
const X509V3_EXT_METHOD ossl_v3_ns_ia5_list[8] = {
EXT_IA5STRING(NID_netscape_base_url),
EXT_IA5STRING(NID_netscape_revocation_url),
EXT_IA5STRING(NID_netscape_ca_revocation_url),

4
crypto/x509/v3_info.c
View File

@ -25,7 +25,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
STACK_OF(CONF_VALUE)
*nval);
const X509V3_EXT_METHOD v3_info = { NID_info_access, X509V3_EXT_MULTILINE,
const X509V3_EXT_METHOD ossl_v3_info = { NID_info_access, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0, 0, 0, 0,
0, 0,
@ -35,7 +35,7 @@ const X509V3_EXT_METHOD v3_info = { NID_info_access, X509V3_EXT_MULTILINE,
NULL
};
const X509V3_EXT_METHOD v3_sinfo = { NID_sinfo_access, X509V3_EXT_MULTILINE,
const X509V3_EXT_METHOD ossl_v3_sinfo = { NID_sinfo_access, X509V3_EXT_MULTILINE,
ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
0, 0, 0, 0,
0, 0,

6
crypto/x509/v3_int.c
View File

@ -12,7 +12,7 @@
#include <openssl/x509v3.h>
#include "ext_dat.h"
const X509V3_EXT_METHOD v3_crl_num = {
const X509V3_EXT_METHOD ossl_v3_crl_num = {
NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0, 0, 0, 0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
@ -20,7 +20,7 @@ const X509V3_EXT_METHOD v3_crl_num = {
0, 0, 0, 0, NULL
};
const X509V3_EXT_METHOD v3_delta_crl = {
const X509V3_EXT_METHOD ossl_v3_delta_crl = {
NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0, 0, 0, 0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
@ -34,7 +34,7 @@ static void *s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx,
return s2i_ASN1_INTEGER(meth, value);
}
const X509V3_EXT_METHOD v3_inhibit_anyp = {
const X509V3_EXT_METHOD ossl_v3_inhibit_anyp = {
NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER),
0, 0, 0, 0,
(X509V3_EXT_I2S)i2s_ASN1_INTEGER,

2
crypto/x509/v3_ist.c
View File

@ -134,7 +134,7 @@ static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method,
return 1;
}
const X509V3_EXT_METHOD v3_issuer_sign_tool = {
const X509V3_EXT_METHOD ossl_v3_issuer_sign_tool = {
NID_issuerSignTool, /* nid */
X509V3_EXT_MULTILINE, /* flags */
ASN1_ITEM_ref(ISSUER_SIGN_TOOL), /* template */

2
crypto/x509/v3_ncons.c
View File

@ -39,7 +39,7 @@ static int nc_email_eai(ASN1_UTF8STRING *sub, ASN1_IA5STRING *eml);
static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base);
static int nc_ip(ASN1_OCTET_STRING *ip, ASN1_OCTET_STRING *base);
const X509V3_EXT_METHOD v3_name_constraints = {
const X509V3_EXT_METHOD ossl_v3_name_constraints = {
NID_name_constraints, 0,
ASN1_ITEM_ref(NAME_CONSTRAINTS),
0, 0, 0, 0,

2
crypto/x509/v3_pci.c
View File

@ -54,7 +54,7 @@ static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
const X509V3_EXT_METHOD v3_pci =
const X509V3_EXT_METHOD ossl_v3_pci =
{ NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
0, 0, 0, 0,
0, 0,

2
crypto/x509/v3_pcons.c
View File

@ -22,7 +22,7 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *values);
const X509V3_EXT_METHOD v3_policy_constraints = {
const X509V3_EXT_METHOD ossl_v3_policy_constraints = {
NID_policy_constraints, 0,
ASN1_ITEM_ref(POLICY_CONSTRAINTS),
0, 0, 0, 0,

2
crypto/x509/v3_pku.c
View File

@ -18,7 +18,7 @@ static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
PKEY_USAGE_PERIOD *usage, BIO *out,
int indent);
const X509V3_EXT_METHOD v3_pkey_usage_period = {
const X509V3_EXT_METHOD ossl_v3_pkey_usage_period = {
NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
0, 0, 0, 0,
0, 0, 0, 0,

2
crypto/x509/v3_pmaps.c
View File

@ -20,7 +20,7 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
*method, void *pmps, STACK_OF(CONF_VALUE)
*extlist);
const X509V3_EXT_METHOD v3_policy_mappings = {
const X509V3_EXT_METHOD ossl_v3_policy_mappings = {
NID_policy_mappings, 0,
ASN1_ITEM_ref(POLICY_MAPPINGS),
0, 0, 0, 0,

22
crypto/x509/v3_san.c
View File

@ -25,7 +25,7 @@ static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
const X509V3_EXT_METHOD v3_alt[3] = {
const X509V3_EXT_METHOD ossl_v3_alt[3] = {
{NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
0, 0, 0, 0,
0, 0,
@ -298,7 +298,7 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
for (i = 0; i < num; i++) {
CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
if (!v3_name_cmp(cnf->name, "issuer")
if (!ossl_v3_name_cmp(cnf->name, "issuer")
&& cnf->value && strcmp(cnf->value, "copy") == 0) {
if (!copy_issuer(ctx, gens))
goto err;
@ -377,11 +377,11 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
for (i = 0; i < num; i++) {
cnf = sk_CONF_VALUE_value(nval, i);
if (!v3_name_cmp(cnf->name, "email")
if (!ossl_v3_name_cmp(cnf->name, "email")
&& cnf->value && strcmp(cnf->value, "copy") == 0) {
if (!copy_email(ctx, gens, 0))
goto err;
} else if (!v3_name_cmp(cnf->name, "email")
} else if (!ossl_v3_name_cmp(cnf->name, "email")
&& cnf->value && strcmp(cnf->value, "move") == 0) {
if (!copy_email(ctx, gens, 1))
goto err;
@ -597,19 +597,19 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
return NULL;
}
if (!v3_name_cmp(name, "email"))
if (!ossl_v3_name_cmp(name, "email"))
type = GEN_EMAIL;
else if (!v3_name_cmp(name, "URI"))
else if (!ossl_v3_name_cmp(name, "URI"))
type = GEN_URI;
else if (!v3_name_cmp(name, "DNS"))
else if (!ossl_v3_name_cmp(name, "DNS"))
type = GEN_DNS;
else if (!v3_name_cmp(name, "RID"))
else if (!ossl_v3_name_cmp(name, "RID"))
type = GEN_RID;
else if (!v3_name_cmp(name, "IP"))
else if (!ossl_v3_name_cmp(name, "IP"))
type = GEN_IPADD;
else if (!v3_name_cmp(name, "dirName"))
else if (!ossl_v3_name_cmp(name, "dirName"))
type = GEN_DIRNAME;
else if (!v3_name_cmp(name, "otherName"))
else if (!ossl_v3_name_cmp(name, "otherName"))
type = GEN_OTHERNAME;
else {
ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNSUPPORTED_OPTION,

10
crypto/x509/v3_skid.c
View File

@ -15,7 +15,7 @@
static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
X509V3_CTX *ctx, char *str);
const X509V3_EXT_METHOD v3_skey_id = {
const X509V3_EXT_METHOD ossl_v3_skey_id = {
NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
0, 0, 0, 0,
(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
@ -52,7 +52,7 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
}
ASN1_OCTET_STRING *x509_pubkey_hash(X509_PUBKEY *pubkey)
ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
{
ASN1_OCTET_STRING *oct;
const unsigned char *pk;
@ -94,7 +94,7 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
return NULL;
}
return x509_pubkey_hash(ctx->subject_req != NULL ?
ctx->subject_req->req_info.pubkey :
ctx->subject_cert->cert_info.key);
return ossl_x509_pubkey_hash(ctx->subject_req != NULL ?
ctx->subject_req->req_info.pubkey :
ctx->subject_cert->cert_info.key);
}

2
crypto/x509/v3_sxnet.c
View File

@ -25,7 +25,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
STACK_OF(CONF_VALUE) *nval);
#endif
const X509V3_EXT_METHOD v3_sxnet = {
const X509V3_EXT_METHOD ossl_v3_sxnet = {
NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
0, 0, 0, 0,
0, 0,

2
crypto/x509/v3_tlsf.c
View File

@ -29,7 +29,7 @@ static_ASN1_ITEM_TEMPLATE_END(TLS_FEATURE)
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
const X509V3_EXT_METHOD v3_tls_feature = {
const X509V3_EXT_METHOD ossl_v3_tls_feature = {
NID_tlsfeature, 0,
ASN1_ITEM_ref(TLS_FEATURE),
0, 0, 0, 0,

2
crypto/x509/v3_utf8.c
View File

@ -22,7 +22,7 @@
*/
const X509V3_EXT_METHOD v3_utf8_list[1] = {
const X509V3_EXT_METHOD ossl_v3_utf8_list[1] = {
EXT_UTF8STRING(NID_subjectSignTool),
};

12
crypto/x509/v3_utl.c
View File

@ -398,7 +398,7 @@ static char *strip_spaces(char *name)
* V2I name comparison function: returns zero if 'name' matches cmp or cmp.*
*/
int v3_name_cmp(const char *name, const char *cmp)
int ossl_v3_name_cmp(const char *name, const char *cmp)
{
int len, ret;
char c;
@ -972,7 +972,7 @@ int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags)
if (ipasc == NULL)
return -2;
iplen = (size_t)a2i_ipadd(ipout, ipasc);
iplen = (size_t)ossl_a2i_ipadd(ipout, ipasc);
if (iplen == 0)
return -2;
return do_x509_check(x, (char *)ipout, iplen, flags, GEN_IPADD, NULL);
@ -1022,7 +1022,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc)
/* If string contains a ':' assume IPv6 */
iplen = a2i_ipadd(ipout, ipasc);
iplen = ossl_a2i_ipadd(ipout, ipasc);
if (!iplen)
return NULL;
@ -1053,12 +1053,12 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
p = iptmp + (p - ipasc);
*p++ = 0;
iplen1 = a2i_ipadd(ipout, iptmp);
iplen1 = ossl_a2i_ipadd(ipout, iptmp);
if (!iplen1)
goto err;
iplen2 = a2i_ipadd(ipout + iplen1, p);
iplen2 = ossl_a2i_ipadd(ipout + iplen1, p);
OPENSSL_free(iptmp);
iptmp = NULL;
@ -1080,7 +1080,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
return NULL;
}
int a2i_ipadd(unsigned char *ipout, const char *ipasc)
int ossl_a2i_ipadd(unsigned char *ipout, const char *ipasc)
{
/* If string contains a ':' assume IPv6 */

2
crypto/x509/x509_vpm.c
View File

@ -472,7 +472,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc)
unsigned char ipout[16];
size_t iplen;
iplen = (size_t)a2i_ipadd(ipout, ipasc);
iplen = (size_t)ossl_a2i_ipadd(ipout, ipasc);
if (iplen == 0)
return 0;
return X509_VERIFY_PARAM_set1_ip(param, ipout, iplen);

4
include/crypto/x509.h
View File

@ -304,7 +304,7 @@ struct x509_object_st {
} data;
};
int a2i_ipadd(unsigned char *ipout, const char *ipasc);
int ossl_a2i_ipadd(unsigned char *ipout, const char *ipasc);
int x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm);
int x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags);
int x509v3_cache_extensions(X509 *x);
@ -325,7 +325,7 @@ int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs,
int X509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq,
const X509_PUBKEY *key);
/* Calculate default key identifier according to RFC 5280 section 4.2.1.2 (1) */
ASN1_OCTET_STRING *x509_pubkey_hash(X509_PUBKEY *pubkey);
ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey);
/* A variant of d2i_PUBKEY() that is guaranteed to only return legacy keys */
EVP_PKEY *d2i_PUBKEY_legacy(EVP_PKEY **a,