diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 16:20:03 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 12:10:41 +0200 |
| commit | 02199cc39db2669933cefc6319599ba491bb3a85 (patch) | |
| tree | c570b461ca10ebc39a91d1a656c12655de0cfd8a /crypto/pkcs12 | |
| parent | Fix safestack issues in ocsp.h (diff) | |
| download | openssl-02199cc39db2669933cefc6319599ba491bb3a85.tar.xz openssl-02199cc39db2669933cefc6319599ba491bb3a85.zip | |
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/pkcs12')
| -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 |
3 files changed, 0 insertions, 3 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 */ |