diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-03 10:23:44 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:09:45 +0100 |
commit | e6623cfbffcc03e2483632359e005ca13adacc9d (patch) | |
tree | 64caba9fa625624f304162011a54a55b09b0ad41 /crypto | |
parent | 6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (diff) |
Fix safestack issues in x509.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')
57 files changed, 0 insertions, 89 deletions
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index fe7168916a..567eb45519 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -22,8 +22,6 @@ #include "openssl/cmp_util.h" DEFINE_STACK_OF(ASN1_UTF8STRING) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_CRL) DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_CERTID) diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c index 6bbd3510c7..f324763bf1 100644 --- a/crypto/cmp/cmp_ctx.c +++ b/crypto/cmp/cmp_ctx.c @@ -21,8 +21,6 @@ #include <openssl/crmf.h> #include <openssl/err.h> -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(POLICYINFO) DEFINE_STACK_OF(ASN1_UTF8STRING) DEFINE_STACK_OF(GENERAL_NAME) diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c index 64e00fc884..11f43ab588 100644 --- a/crypto/cmp/cmp_msg.c +++ b/crypto/cmp/cmp_msg.c @@ -24,8 +24,6 @@ DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) DEFINE_STACK_OF(OSSL_CMP_ITAV) DEFINE_STACK_OF(GENERAL_NAME) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(OSSL_CMP_PKISI) DEFINE_STACK_OF(OSSL_CRMF_MSG) DEFINE_STACK_OF(OSSL_CMP_CERTRESPONSE) diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c index a6a0f9f9e0..eb162e382d 100644 --- a/crypto/cmp/cmp_protect.c +++ b/crypto/cmp/cmp_protect.c @@ -18,8 +18,6 @@ #include <openssl/err.h> #include <openssl/x509.h> -DEFINE_STACK_OF(X509) - /* * This function is also used by the internal verify_PBMAC() in cmp_vfy.c. * diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c index 2ba6cb7984..3c247336fc 100644 --- a/crypto/cmp/cmp_server.c +++ b/crypto/cmp/cmp_server.c @@ -20,7 +20,6 @@ #include <openssl/err.h> DEFINE_STACK_OF(OSSL_CRMF_MSG) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OSSL_CMP_ITAV) DEFINE_STACK_OF(OSSL_CMP_CERTSTATUS) diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c index c2ee9b6e0d..ec292ee352 100644 --- a/crypto/cmp/cmp_util.c +++ b/crypto/cmp/cmp_util.c @@ -16,7 +16,6 @@ #include <openssl/err.h> /* should be implied by cmperr.h */ #include <openssl/x509v3.h> -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(X509_OBJECT) DEFINE_STACK_OF(ASN1_UTF8STRING) diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c index f5026e0bbc..00757c11ae 100644 --- a/crypto/cmp/cmp_vfy.c +++ b/crypto/cmp/cmp_vfy.c @@ -22,8 +22,6 @@ #include <openssl/x509.h> #include "crypto/x509.h" -DEFINE_STACK_OF(X509) - /* Verify a message protected by signature according to RFC section 5.1.3.3 */ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx, const OSSL_CMP_MSG *msg, X509 *cert) diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 944846ca98..f0c895704f 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -21,7 +21,6 @@ DEFINE_STACK_OF(CMS_RecipientInfo) DEFINE_STACK_OF(CMS_RevocationInfoChoice) -DEFINE_STACK_OF(X509_ATTRIBUTE) /* CMS EnvelopedData Utilities */ static void cms_env_set_version(CMS_EnvelopedData *env); diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index b6b2037532..6fc0ca27d9 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -24,7 +24,6 @@ DEFINE_STACK_OF(GENERAL_NAMES) DEFINE_STACK_OF(CMS_SignerInfo) DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) -DEFINE_STACK_OF(X509) IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest) diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index 9fc8453d99..0b9a3f2b2f 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -22,8 +22,6 @@ static STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms); DEFINE_STACK_OF(CMS_RevocationInfoChoice) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_CRL) IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index c11d44487b..ac07ddefe9 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -24,9 +24,7 @@ DEFINE_STACK_OF(CMS_RevocationInfoChoice) DEFINE_STACK_OF(CMS_SignerInfo) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(X509_ALGOR) -DEFINE_STACK_OF(X509_ATTRIBUTE) /* CMS SignedData Utilities */ diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 92de68aa57..b2287c624d 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -17,8 +17,6 @@ #include "crypto/asn1.h" DEFINE_STACK_OF(CMS_SignerInfo) -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_CRL) DEFINE_STACK_OF(CMS_RecipientEncryptedKey) DEFINE_STACK_OF(CMS_RecipientInfo) diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c index 3202f357c1..5c3acaf4b2 100644 --- a/crypto/crmf/crmf_lib.c +++ b/crypto/crmf/crmf_lib.c @@ -36,7 +36,6 @@ #include <openssl/err.h> #include <openssl/evp.h> -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(OSSL_CRMF_MSG) /*- diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c index ad0d6f332c..92073b9598 100644 --- a/crypto/ess/ess_lib.c +++ b/crypto/ess/ess_lib.c @@ -17,7 +17,6 @@ DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) DEFINE_STACK_OF(GENERAL_NAME) -DEFINE_STACK_OF(X509) static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed); static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index cb72048f86..8fe702787d 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -38,7 +38,6 @@ #include "internal/evp.h" #include "internal/provider.h" #include "evp_local.h" -DEFINE_STACK_OF(X509_ATTRIBUTE) #include "crypto/ec.h" diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c index f45bf1d6dc..b977e88d03 100644 --- a/crypto/ocsp/ocsp_cl.c +++ b/crypto/ocsp/ocsp_cl.c @@ -18,7 +18,6 @@ #include <openssl/ocsp.h> #include "ocsp_local.h" -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OCSP_ONEREQ) DEFINE_STACK_OF(OCSP_SINGLERESP) diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c index c782a8e531..c4917ee184 100644 --- a/crypto/ocsp/ocsp_prn.c +++ b/crypto/ocsp/ocsp_prn.c @@ -15,7 +15,6 @@ #include <openssl/pem.h> DEFINE_STACK_OF(OCSP_ONEREQ) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OCSP_SINGLERESP) static int ocsp_certid_print(BIO *bp, OCSP_CERTID *a, int indent) diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c index d20a714855..a87fea892d 100644 --- a/crypto/ocsp/ocsp_srv.c +++ b/crypto/ocsp/ocsp_srv.c @@ -17,7 +17,6 @@ #include "ocsp_local.h" DEFINE_STACK_OF(OCSP_ONEREQ) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OCSP_SINGLERESP) /* diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c index cf7602616f..35a01c444d 100644 --- a/crypto/ocsp/ocsp_vfy.c +++ b/crypto/ocsp/ocsp_vfy.c @@ -13,7 +13,6 @@ #include <string.h> DEFINE_STACK_OF(OCSP_ONEREQ) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(OCSP_SINGLERESP) static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs, diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index a3981c9dda..ef023205c0 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -23,8 +23,6 @@ #include <openssl/rsa.h> #include <openssl/dsa.h> -DEFINE_STACK_OF(X509_INFO) - #ifndef OPENSSL_NO_STDIO STACK_OF(X509_INFO) *PEM_X509_INFO_read_with_libctx(FILE *fp, STACK_OF(X509_INFO) *sk, diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index 699f1b7d61..757b6ae631 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -12,7 +12,6 @@ #include <openssl/pkcs12.h> #include "p12_local.h" -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 5413aecb1c..433bccdb30 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -12,7 +12,6 @@ #include <openssl/pkcs12.h> #include "crypto/x509.h" /* for X509_add_cert_new() */ -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index c48c629398..faefa9e95b 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -17,7 +17,6 @@ #include "pk7_local.h" DEFINE_STACK_OF(X509_ALGOR) -DEFINE_STACK_OF(X509_ATTRIBUTE) DEFINE_STACK_OF(PKCS7_RECIP_INFO) DEFINE_STACK_OF(PKCS7_SIGNER_INFO) diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c index d891ca22e8..59e23a445f 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -16,8 +16,6 @@ #include "crypto/x509.h" /* for sk_X509_add1_cert() */ #include "pk7_local.h" -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_CRL) DEFINE_STACK_OF(X509_ALGOR) DEFINE_STACK_OF(PKCS7_RECIP_INFO) DEFINE_STACK_OF(PKCS7_SIGNER_INFO) diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index 1dfdd69e51..2bd495a717 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -17,8 +17,6 @@ #define BUFFERSIZE 4096 -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_ATTRIBUTE) DEFINE_STACK_OF(X509_ALGOR) DEFINE_STACK_OF(PKCS7_SIGNER_INFO) diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index 47dd21acb9..0c78e94ec4 100644 --- a/crypto/store/store_result.c +++ b/crypto/store/store_result.c @@ -59,8 +59,6 @@ * reference. */ -DEFINE_STACK_OF(X509) - struct extracted_param_data_st { int object_type; const char *data_type; diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c index 71664fa091..9d4011519e 100644 --- a/crypto/ts/ts_conf.c +++ b/crypto/ts/ts_conf.c @@ -18,8 +18,6 @@ #include <openssl/engine.h> #include <openssl/ts.h> -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_INFO) DEFINE_STACK_OF(CONF_VALUE) /* Macro definitions for the configuration file. */ diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c index 2d14ed1145..e4b3eee48f 100644 --- a/crypto/ts/ts_req_utils.c +++ b/crypto/ts/ts_req_utils.c @@ -14,8 +14,6 @@ #include <openssl/ts.h> #include "ts_local.h" -DEFINE_STACK_OF(X509_EXTENSION) - int TS_REQ_set_version(TS_REQ *a, long version) { return ASN1_INTEGER_set(a->version, version); diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 33f2b511e8..a1904719cc 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -17,8 +17,6 @@ #include "ts_local.h" #include "crypto/ess.h" -DEFINE_STACK_OF(X509) -DEFINE_STACK_OF(X509_EXTENSION) DEFINE_STACK_OF(ASN1_UTF8STRING) DEFINE_STACK_OF(ASN1_OBJECT) DEFINE_STACK_OF_CONST(EVP_MD) diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c index 86e1a9d49d..92dcb5bff7 100644 --- a/crypto/ts/ts_rsp_utils.c +++ b/crypto/ts/ts_rsp_utils.c @@ -14,8 +14,6 @@ #include <openssl/pkcs7.h> #include "ts_local.h" -DEFINE_STACK_OF(X509_EXTENSION) - int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info) { TS_STATUS_INFO *new_status_info; diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index c909b211d4..1ca14bc056 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -16,7 +16,6 @@ #include "crypto/ess.h" DEFINE_STACK_OF(PKCS7_SIGNER_INFO) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) DEFINE_STACK_OF(ASN1_UTF8STRING) diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c index 2c95fd1f14..776d5cf43e 100644 --- a/crypto/ts/ts_verify_ctx.c +++ b/crypto/ts/ts_verify_ctx.c @@ -12,8 +12,6 @@ #include <openssl/ts.h> #include "ts_local.h" -DEFINE_STACK_OF(X509) - TS_VERIFY_CTX *TS_VERIFY_CTX_new(void) { TS_VERIFY_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index d5e6dde4f8..a4ec328312 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -17,8 +17,6 @@ #include <openssl/pem.h> #include "x509_local.h" -DEFINE_STACK_OF(X509_INFO) - static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); static int by_file_ctrl_with_libctx(X509_LOOKUP *ctx, int cmd, diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c index 30879197f8..8b127cf291 100644 --- a/crypto/x509/pcy_tree.c +++ b/crypto/x509/pcy_tree.c @@ -15,7 +15,6 @@ #include "pcy_local.h" DEFINE_STACK_OF(ASN1_OBJECT) -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(X509_POLICY_NODE) static void expected_print(BIO *channel, diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c index 0824bb6def..44be2f237b 100644 --- a/crypto/x509/t_crl.c +++ b/crypto/x509/t_crl.c @@ -15,8 +15,6 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -DEFINE_STACK_OF(X509_REVOKED) - #ifndef OPENSSL_NO_STDIO int X509_CRL_print_fp(FILE *fp, X509_CRL *x) { diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c index e1ee12de95..abcca0a8f5 100644 --- a/crypto/x509/t_req.c +++ b/crypto/x509/t_req.c @@ -17,8 +17,6 @@ #include <openssl/rsa.h> #include <openssl/dsa.h> -DEFINE_STACK_OF(X509_EXTENSION) - #ifndef OPENSSL_NO_STDIO int X509_REQ_print_fp(FILE *fp, X509_REQ *x) { diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c index f0240f12c3..8f4b8e8222 100644 --- a/crypto/x509/t_x509.c +++ b/crypto/x509/t_x509.c @@ -17,7 +17,6 @@ #include "crypto/asn1.h" #include "crypto/x509.h" -DEFINE_STACK_OF(X509) DEFINE_STACK_OF(ASN1_OBJECT) #ifndef OPENSSL_NO_STDIO diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c index d965d74553..b369f79d01 100644 --- a/crypto/x509/v3_addr.c +++ b/crypto/x509/v3_addr.c @@ -29,7 +29,6 @@ DEFINE_STACK_OF(IPAddressOrRange) DEFINE_STACK_OF(IPAddressFamily) DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF(X509) /* * OpenSSL ASN.1 template translation of RFC 3779 2.2.3. diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c index 0fc7641386..e5fcff5522 100644 --- a/crypto/x509/v3_asid.c +++ b/crypto/x509/v3_asid.c @@ -58,7 +58,6 @@ IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers) DEFINE_STACK_OF(ASIdOrRange) DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF(X509) /* * i2r method for an ASIdentifierChoice. diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c index 88e29f9cc4..3471ce098f 100644 --- a/crypto/x509/v3_conf.c +++ b/crypto/x509/v3_conf.c @@ -18,7 +18,6 @@ #include <openssl/x509v3.h> DEFINE_STACK_OF(CONF_VALUE) -DEFINE_STACK_OF(X509_EXTENSION) static int v3_check_critical(const char **value); static int v3_check_generic(const char **value); diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c index 8b4e100714..2daaad84c1 100644 --- a/crypto/x509/v3_crld.c +++ b/crypto/x509/v3_crld.c @@ -21,7 +21,6 @@ DEFINE_STACK_OF(CONF_VALUE) DEFINE_STACK_OF(GENERAL_NAME) DEFINE_STACK_OF(DIST_POINT) -DEFINE_STACK_OF(X509_NAME_ENTRY) static void *v2i_crld(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c ind |