diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 14:35:41 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 11:10:40 +0100 |
| commit | b4780134df95b34ae263e966e93c83594a38de5b (patch) | |
| tree | 81e361e6653d1fc025af029be24d71af6a8f5051 /crypto/pkcs7 | |
| parent | 24c4ea958ecae0b194cc3eb812a81766cdb421f6 (diff) | |
Fix safestack issues in asn1.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/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_attr.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 1 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_lib.c | 1 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c index 926a02a32e..7df05c8084 100644 --- a/crypto/pkcs7/pk7_attr.c +++ b/crypto/pkcs7/pk7_attr.c @@ -17,8 +17,6 @@ #include <openssl/x509.h> #include <openssl/err.h> -DEFINE_STACK_OF(X509_ALGOR) - int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap) { diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index faefa9e95b..8362d77b7e 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -16,7 +16,6 @@ #include <openssl/err.h> #include "pk7_local.h" -DEFINE_STACK_OF(X509_ALGOR) 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 59e23a445f..e169783e52 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -16,7 +16,6 @@ #include "crypto/x509.h" /* for sk_X509_add1_cert() */ #include "pk7_local.h" -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 2bd495a717..de8c0568db 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -17,7 +17,6 @@ #define BUFFERSIZE 4096 -DEFINE_STACK_OF(X509_ALGOR) DEFINE_STACK_OF(PKCS7_SIGNER_INFO) static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); |