diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-12-19 17:30:24 -0500 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-04-24 16:42:46 +0200 |
| commit | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (patch) | |
| tree | d8104686e0a02217c13f51e5d10d7434fa13e3dc /crypto/pkcs7 | |
| parent | 4692e98bdbaebb6f078e89a75c54395839e68b24 (diff) | |
In OpenSSL builds, declare STACK for datatypes ...
... and only *define* them in the source files that need them.
Use DEFINE_OR_DECLARE which is set appropriately for internal builds
and not non-deprecated builds.
Deprecate stack-of-block
Better documentation
Move some ASN1 struct typedefs to types.h
Update ParseC to handle this. Most of all, ParseC needed to be more
consistent. The handlers are "recursive", in so far that they are called
again and again until they terminate, which depends entirely on what the
"massager" returns. There's a comment at the beginning of ParseC that
explains how that works. {Richard Levtte}
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10669)
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_attr.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 5 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_lib.c | 6 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 6 |
4 files changed, 18 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c index e7bc808cc4..1c95a3cfce 100644 --- a/crypto/pkcs7/pk7_attr.c +++ b/crypto/pkcs7/pk7_attr.c @@ -17,6 +17,8 @@ #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 2cf62b62cd..9fb3ffc1a2 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -15,6 +15,11 @@ #include <openssl/x509v3.h> #include <openssl/err.h> +DEFINE_STACK_OF(X509_ALGOR) +DEFINE_STACK_OF(X509_ATTRIBUTE) +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 ca039656f0..0eb140e6ae 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -14,6 +14,12 @@ #include "crypto/asn1.h" #include "crypto/evp.h" +DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(X509_CRL) +DEFINE_STACK_OF(X509_ALGOR) +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 43ad266a6c..3ef59c57ba 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -14,9 +14,13 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> - #define BUFFERSIZE 4096 +DEFINE_STACK_OF(X509) +DEFINE_STACK_OF(X509_ATTRIBUTE) +DEFINE_STACK_OF(X509_ALGOR) +DEFINE_STACK_OF(PKCS7_SIGNER_INFO) + static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, |