diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:14:28 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:11:20 +0100 |
commit | e74e562f1c518839cc9b63aafd4af6644e01d9ca (patch) | |
tree | ed8d2cc7f428c78fd9fc3456bafcce76e346d739 /crypto/x509 | |
parent | dd731474207126615679f4cc9ae772d7da990332 (diff) |
Fix safestack issues in conf.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'crypto/x509')
-rw-r--r-- | crypto/x509/v3_addr.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_akey.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_alt.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_asid.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_bcons.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_bitst.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_conf.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_cpols.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_crld.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_extku.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_info.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_ist.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_ncons.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_pci.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_pcons.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_pmaps.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_prn.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_sxnet.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_tlsf.c | 2 | ||||
-rw-r--r-- | crypto/x509/v3_utl.c | 2 |
20 files changed, 0 insertions, 40 deletions
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c index f281267b07..64127cff6b 100644 --- a/crypto/x509/v3_addr.c +++ b/crypto/x509/v3_addr.c @@ -26,8 +26,6 @@ #ifndef OPENSSL_NO_RFC3779 -DEFINE_STACK_OF(CONF_VALUE) - /* * OpenSSL ASN.1 template translation of RFC 3779 2.2.3. */ diff --git a/crypto/x509/v3_akey.c b/crypto/x509/v3_akey.c index 50dca6ce5d..a3061c9a8f 100644 --- a/crypto/x509/v3_akey.c +++ b/crypto/x509/v3_akey.c @@ -15,8 +15,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) diff --git a/crypto/x509/v3_alt.c b/crypto/x509/v3_alt.c index f810fc6c42..caa2f23220 100644 --- a/crypto/x509/v3_alt.c +++ b/crypto/x509/v3_alt.c @@ -14,8 +14,6 @@ #include <openssl/bio.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c index 67160aac26..93b345a0b8 100644 --- a/crypto/x509/v3_asid.c +++ b/crypto/x509/v3_asid.c @@ -56,8 +56,6 @@ IMPLEMENT_ASN1_FUNCTIONS(ASIdOrRange) IMPLEMENT_ASN1_FUNCTIONS(ASIdentifierChoice) IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers) -DEFINE_STACK_OF(CONF_VALUE) - /* * i2r method for an ASIdentifierChoice. */ diff --git a/crypto/x509/v3_bcons.c b/crypto/x509/v3_bcons.c index 01d38473a3..7a06a9d0ff 100644 --- a/crypto/x509/v3_bcons.c +++ b/crypto/x509/v3_bcons.c @@ -16,8 +16,6 @@ #include "ext_dat.h" #include "x509_local.h" -DEFINE_STACK_OF(CONF_VALUE) - static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) diff --git a/crypto/x509/v3_bitst.c b/crypto/x509/v3_bitst.c index 02d40863a6..21511603c2 100644 --- a/crypto/x509/v3_bitst.c +++ b/crypto/x509/v3_bitst.c @@ -13,8 +13,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static BIT_STRING_BITNAME ns_cert_type_table[] = { {0, "SSL Client", "client"}, {1, "SSL Server", "server"}, diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c index 3471ce098f..918e96e709 100644 --- a/crypto/x509/v3_conf.c +++ b/crypto/x509/v3_conf.c @@ -17,8 +17,6 @@ #include "crypto/x509.h" #include <openssl/x509v3.h> -DEFINE_STACK_OF(CONF_VALUE) - static int v3_check_critical(const char **value); static int v3_check_generic(const char **value); static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid, diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c index f7dcfb5dce..9a227e4058 100644 --- a/crypto/x509/v3_cpols.c +++ b/crypto/x509/v3_cpols.c @@ -18,8 +18,6 @@ #include "pcy_local.h" #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - /* Certificate policies extension support: this one is a bit complex... */ static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c index 19b016227f..81ea31b16f 100644 --- a/crypto/x509/v3_crld.c +++ b/crypto/x509/v3_crld.c @@ -18,8 +18,6 @@ #include "ext_dat.h" #include "x509_local.h" -DEFINE_STACK_OF(CONF_VALUE) - static void *v2i_crld(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out, diff --git a/crypto/x509/v3_extku.c b/crypto/x509/v3_extku.c index b96fb58ac8..b9a1447b82 100644 --- a/crypto/x509/v3_extku.c +++ b/crypto/x509/v3_extku.c @@ -14,8 +14,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); diff --git a/crypto/x509/v3_info.c b/crypto/x509/v3_info.c index 2c788d89ec..3711b51e18 100644 --- a/crypto/x509/v3_info.c +++ b/crypto/x509/v3_info.c @@ -15,8 +15,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method, AUTHORITY_INFO_ACCESS *ainfo, STACK_OF(CONF_VALUE) diff --git a/crypto/x509/v3_ist.c b/crypto/x509/v3_ist.c index ceb127f637..6db4f19913 100644 --- a/crypto/x509/v3_ist.c +++ b/crypto/x509/v3_ist.c @@ -15,8 +15,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - /* * Issuer Sign Tool (1.2.643.100.112) The name of the tool used to signs the subject (ASN1_SEQUENCE) * This extention is required to obtain the status of a qualified certificate at Russian Federation. diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c index 6c73745904..6af8edecdb 100644 --- a/crypto/x509/v3_ncons.c +++ b/crypto/x509/v3_ncons.c @@ -20,8 +20,6 @@ #include "crypto/punycode.h" #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); diff --git a/crypto/x509/v3_pci.c b/crypto/x509/v3_pci.c index 714733684b..febb07f7d4 100644 --- a/crypto/x509/v3_pci.c +++ b/crypto/x509/v3_pci.c @@ -49,8 +49,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext, BIO *out, int indent); static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method, diff --git a/crypto/x509/v3_pcons.c b/crypto/x509/v3_pcons.c index 88a9497504..e61a14e254 100644 --- a/crypto/x509/v3_pcons.c +++ b/crypto/x509/v3_pcons.c @@ -15,8 +15,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *bcons, STACK_OF(CONF_VALUE) *extlist); diff --git a/crypto/x509/v3_pmaps.c b/crypto/x509/v3_pmaps.c index c63a0e4cb9..a2b95c48e4 100644 --- a/crypto/x509/v3_pmaps.c +++ b/crypto/x509/v3_pmaps.c @@ -14,8 +14,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD diff --git a/crypto/x509/v3_prn.c b/crypto/x509/v3_prn.c index de39a0f0b0..1e4516a713 100644 --- a/crypto/x509/v3_prn.c +++ b/crypto/x509/v3_prn.c @@ -14,8 +14,6 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -DEFINE_STACK_OF(CONF_VALUE) - /* Extension printing routines */ static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen, diff --git a/crypto/x509/v3_sxnet.c b/crypto/x509/v3_sxnet.c index ce878c3779..b7623b1051 100644 --- a/crypto/x509/v3_sxnet.c +++ b/crypto/x509/v3_sxnet.c @@ -15,8 +15,6 @@ #include <openssl/x509v3.h> #include "ext_dat.h" -DEFINE_STACK_OF(CONF_VALUE) - /* Support for Thawte strong extranet extension */ #define SXNET_TEST diff --git a/crypto/x509/v3_tlsf.c b/crypto/x509/v3_tlsf.c index 1ccf7dab10..bc0a463dec 100644 --- a/crypto/x509/v3_tlsf.c +++ b/crypto/x509/v3_tlsf.c @@ -16,8 +16,6 @@ #include "ext_dat.h" #include "x509_local.h" -DEFINE_STACK_OF(CONF_VALUE) - static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method, TLS_FEATURE *tls_feature, STACK_OF(CONF_VALUE) *ext_list); diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index 8acdfd3296..001c5f2296 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -21,8 +21,6 @@ #include "ext_dat.h" #include "x509_local.h" -DEFINE_STACK_OF(CONF_VALUE) - static char *strip_spaces(char *name); static int sk_strcmp(const char *const *a, const char *const *b); static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name, |