diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-03 17:35:20 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-13 12:11:21 +0200 |
| commit | add339272773072e0d8995362c6167e515377c7f (patch) | |
| tree | 2ff7010f293d72c4a210d69969edc0f477f5c65e /crypto/pkcs12 | |
| parent | Fix safestack issues in crypto.h (diff) | |
| download | openssl-add339272773072e0d8995362c6167e515377c7f.tar.xz openssl-add339272773072e0d8995362c6167e515377c7f.zip | |
Fix safestack issues in pkcs12.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 | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_npas.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index d673c8b293..88571fd165 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -12,8 +12,6 @@ #include <openssl/pkcs12.h> #include "p12_local.h" -DEFINE_STACK_OF(PKCS12_SAFEBAG) - static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag); diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index a43091380c..126a6ce94b 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -12,8 +12,6 @@ #include <openssl/pkcs12.h> #include "crypto/x509.h" /* for X509_add_cert_new() */ -DEFINE_STACK_OF(PKCS12_SAFEBAG) - /* Simplified PKCS#12 routines */ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen, diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c index 99e21489ad..ee35c45abb 100644 --- a/crypto/pkcs12/p12_npas.c +++ b/crypto/pkcs12/p12_npas.c @@ -15,8 +15,6 @@ #include <openssl/pkcs12.h> #include "p12_local.h" -DEFINE_STACK_OF(PKCS12_SAFEBAG) - /* PKCS#12 password change routine */ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass); |