diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 15:20:03 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:41 +0100 |
| commit | 02199cc39db2669933cefc6319599ba491bb3a85 (patch) | |
| tree | c570b461ca10ebc39a91d1a656c12655de0cfd8a /crypto | |
| parent | fd3ed85c67174a0d3b6639ba9b237351d1c2201f (diff) | |
Fix safestack issues in pkcs7.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/pkcs12/p12_crt.c | 1 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 1 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_npas.c | 1 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 3 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_lib.c | 3 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 1 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_verify.c | 1 |
7 files changed, 0 insertions, 11 deletions
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index 757b6ae631..d673c8b293 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(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 433bccdb30..a43091380c 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(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) /* Simplified PKCS#12 routines */ diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c index a83d745bd5..99e21489ad 100644 --- a/crypto/pkcs12/p12_npas.c +++ b/crypto/pkcs12/p12_npas.c @@ -15,7 +15,6 @@ #include <openssl/pkcs12.h> #include "p12_local.h" -DEFINE_STACK_OF(PKCS7) DEFINE_STACK_OF(PKCS12_SAFEBAG) /* PKCS#12 password change routine */ diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 8362d77b7e..bc9bfd8589 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -16,9 +16,6 @@ #include <openssl/err.h> #include "pk7_local.h" -DEFINE_STACK_OF(PKCS7_RECIP_INFO) -DEFINE_STACK_OF(PKCS7_SIGNER_INFO) - static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype, void *value); static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid); diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c index e169783e52..8f92424ad7 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -16,9 +16,6 @@ #include "crypto/x509.h" /* for sk_X509_add1_cert() */ #include "pk7_local.h" -DEFINE_STACK_OF(PKCS7_RECIP_INFO) -DEFINE_STACK_OF(PKCS7_SIGNER_INFO) - long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg) { int nid; diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index de8c0568db..3347544bb8 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -17,7 +17,6 @@ #define BUFFERSIZE 4096 -DEFINE_STACK_OF(PKCS7_SIGNER_INFO) static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index 0077798c43..cec15bd094 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -15,7 +15,6 @@ #include "ts_local.h" #include "crypto/ess.h" -DEFINE_STACK_OF(PKCS7_SIGNER_INFO) DEFINE_STACK_OF(ESS_CERT_ID) DEFINE_STACK_OF(ESS_CERT_ID_V2) |