diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 15:55:08 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 12:10:41 +0200 |
| commit | 904e1f92b381a15139af154ca58fd6d9f566ab2e (patch) | |
| tree | ef48b3f8b60c3ad986e0bb380440d6b6edb07873 /crypto | |
| parent | Fix safestack issues in cmp.h (diff) | |
| download | openssl-904e1f92b381a15139af154ca58fd6d9f566ab2e.tar.xz openssl-904e1f92b381a15139af154ca58fd6d9f566ab2e.zip | |
Fix safestack issues in cms.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')
| -rw-r--r-- | crypto/cms/cms_env.c | 3 | ||||
| -rw-r--r-- | crypto/cms/cms_ess.c | 1 | ||||
| -rw-r--r-- | crypto/cms/cms_kari.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_lib.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_pwri.c | 2 | ||||
| -rw-r--r-- | crypto/cms/cms_sd.c | 3 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 4 |
7 files changed, 0 insertions, 17 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index f0c895704f..068696586e 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -19,9 +19,6 @@ #include "crypto/x509.h" #include "cms_local.h" -DEFINE_STACK_OF(CMS_RecipientInfo) -DEFINE_STACK_OF(CMS_RevocationInfoChoice) - /* 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 df2ab07f73..9903c444fa 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -20,7 +20,6 @@ #include "crypto/x509.h" #include "cms_local.h" -DEFINE_STACK_OF(CMS_SignerInfo) DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index b5d85b7d67..82a03e6c6b 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -23,8 +23,6 @@ #include "cms_local.h" #include "crypto/asn1.h" -DEFINE_STACK_OF(CMS_RecipientEncryptedKey) - /* Key Agreement Recipient Info (KARI) routines */ int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri, diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index 0b9a3f2b2f..bc7da7ff94 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -21,8 +21,6 @@ static STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms); -DEFINE_STACK_OF(CMS_RevocationInfoChoice) - IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a, diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index e281bd72f2..0393608fdb 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -18,8 +18,6 @@ #include "cms_local.h" #include "crypto/asn1.h" -DEFINE_STACK_OF(CMS_RecipientInfo) - int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass, ossl_ssize_t passlen) { diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index e76766bab7..4b6822f4fd 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -22,9 +22,6 @@ #include "crypto/ess.h" #include "crypto/x509.h" /* for X509_add_cert_new() */ -DEFINE_STACK_OF(CMS_RevocationInfoChoice) -DEFINE_STACK_OF(CMS_SignerInfo) - /* CMS SignedData Utilities */ static CMS_SignedData *cms_get0_signed(CMS_ContentInfo *cms) diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index b2287c624d..a50eee9fa9 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -16,10 +16,6 @@ #include "cms_local.h" #include "crypto/asn1.h" -DEFINE_STACK_OF(CMS_SignerInfo) -DEFINE_STACK_OF(CMS_RecipientEncryptedKey) -DEFINE_STACK_OF(CMS_RecipientInfo) - static BIO *cms_get_text_bio(BIO *out, unsigned int flags) { BIO *rbio; |