stack.

[openssl.git] / crypto / pkcs7 / pkcs7.h

diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index 9d6ae038a4945ed8753f35bd22aba5ec7c7514cf..c1414edeba0feb89cd1effb1f8070b5e04022a52 100644 (file)
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -98,6 +98,9 @@ typedef struct pkcs7_signer_info_st
        EVP_PKEY                        *pkey;
        } PKCS7_SIGNER_INFO;
 
+DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
+DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
+
 typedef struct pkcs7_recip_info_st
        {
        ASN1_INTEGER                    *version;       /* version 0 */
@@ -107,13 +110,16 @@ typedef struct pkcs7_recip_info_st
        X509                            *cert; /* get the pub-key from this */
        } PKCS7_RECIP_INFO;
 
+DECLARE_STACK_OF(PKCS7_RECIP_INFO)
+DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
+
 typedef struct pkcs7_signed_st
        {
        ASN1_INTEGER                    *version;       /* version 1 */
        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
        STACK_OF(X509)                  *cert;          /* [ 0 ] */
-       STACK /* X509_CRL */            *crl;           /* [ 1 ] */
-       STACK /* PKCS7_SIGNER_INFO */   *signer_info;
+       STACK_OF(X509_CRL)              *crl;           /* [ 1 ] */
+       STACK_OF(PKCS7_SIGNER_INFO)     *signer_info;
 
        struct pkcs7_st                 *contents;
        } PKCS7_SIGNED;
@@ -131,7 +137,7 @@ typedef struct pkcs7_enc_content_st
 typedef struct pkcs7_enveloped_st
        {
        ASN1_INTEGER                    *version;       /* version 0 */
-       STACK /* PKCS7_RECIP_INFO */    *recipientinfo;
+       STACK_OF(PKCS7_RECIP_INFO)      *recipientinfo;
        PKCS7_ENC_CONTENT               *enc_data;
        } PKCS7_ENVELOPE;
 
@@ -140,11 +146,11 @@ typedef struct pkcs7_signedandenveloped_st
        ASN1_INTEGER                    *version;       /* version 1 */
        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
        STACK_OF(X509)                  *cert;          /* [ 0 ] */
-       STACK /* X509_CRL */            *crl;           /* [ 1 ] */
-       STACK /* PKCS7_SIGNER_INFO */   *signer_info;
+       STACK_OF(X509_CRL)              *crl;           /* [ 1 ] */
+       STACK_OF(PKCS7_SIGNER_INFO)     *signer_info;
 
        PKCS7_ENC_CONTENT               *enc_data;
-       STACK /* PKCS7_RECIP_INFO */    *recipientinfo;
+       STACK_OF(PKCS7_RECIP_INFO)      *recipientinfo;
        } PKCS7_SIGN_ENVELOPE;
 
 typedef struct pkcs7_digest_st
@@ -336,7 +342,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
 PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
        EVP_PKEY *pkey, EVP_MD *dgst);
 X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-STACK *PKCS7_get_signer_info(PKCS7 *p7);
+STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
 
 PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
 int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);