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/cms | |
| 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/cms')
| -rw-r--r-- | crypto/cms/cms_env.c | 1 | ||||
| -rw-r--r-- | crypto/cms/cms_ess.c | 1 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_sd.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 2 |
5 files changed, 0 insertions, 8 deletions
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) |