1 files changed, 82 insertions, 114 deletions

diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index ee12f670a8..c42bd6d391 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -63,8 +63,17 @@
 extern "C" {
 #endif
 
-#include "bio.h"
-#include "x509.h"
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+
+#ifdef VMS
+#include <openssl/vms_idhacks.h>
+#endif
+
+#ifdef WIN32
+/* Under Win32 this is defined in wincrypt.h */
+#undef PKCS7_ISSUER_AND_SERIAL
+#endif
 
 /*
 Encryption_ID           DES-CBC
@@ -84,15 +93,18 @@ typedef struct pkcs7_signer_info_st
         ASN1_INTEGER                    *version;       /* version 1 */
         PKCS7_ISSUER_AND_SERIAL         *issuer_and_serial;
         X509_ALGOR                      *digest_alg;
-        STACK /* X509_ATTRIBUTE */      *auth_attr;     /* [ 0 ] */
+        STACK_OF(X509_ATTRIBUTE)        *auth_attr;     /* [ 0 ] */
         X509_ALGOR                      *digest_enc_alg;
         ASN1_OCTET_STRING               *enc_digest;
-        STACK /* X509_ATTRIBUTE */      *unauth_attr;   /* [ 1 ] */
+        STACK_OF(X509_ATTRIBUTE)        *unauth_attr;   /* [ 1 ] */
 
         /* The private key to sign with */
         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 */
@@ -102,13 +114,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 /* X509_ALGOR's */        *md_algs;       /* md used */
-        STACK /* X509 */                *cert;          /* [ 0 ] */
-        STACK /* X509_CRL */            *crl;           /* [ 1 ] */
-        STACK /* PKCS7_SIGNER_INFO */   *signer_info;
+        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
+        STACK_OF(X509)                  *cert;          /* [ 0 ] */
+        STACK_OF(X509_CRL)              *crl;           /* [ 1 ] */
+        STACK_OF(PKCS7_SIGNER_INFO)     *signer_info;
 
         struct pkcs7_st                 *contents;
         } PKCS7_SIGNED;
@@ -120,25 +135,26 @@ typedef struct pkcs7_enc_content_st
         ASN1_OBJECT                     *content_type;
         X509_ALGOR                      *algorithm;
         ASN1_OCTET_STRING               *enc_data;      /* [ 0 ] */
+        const EVP_CIPHER                *cipher;
         } PKCS7_ENC_CONTENT;
 
 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;
-        
+
 typedef struct pkcs7_signedandenveloped_st
         {
         ASN1_INTEGER                    *version;       /* version 1 */
-        STACK /* X509_ALGOR's */        *md_algs;       /* md used */
-        STACK /* X509 */                *cert;          /* [ 0 ] */
-        STACK /* X509_CRL */            *crl;           /* [ 1 ] */
-        STACK /* PKCS7_SIGNER_INFO */   *signer_info;
+        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
+        STACK_OF(X509)                  *cert;          /* [ 0 ] */
+        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
@@ -199,7 +215,12 @@ typedef struct pkcs7_st
 #define PKCS7_OP_SET_DETACHED_SIGNATURE 1
 #define PKCS7_OP_GET_DETACHED_SIGNATURE 2
 
+#define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
+#define PKCS7_get_attributes(si)        ((si)->unauth_attr)
+
 #define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
+#define PKCS7_type_is_signedAndEnveloped(a) \
+                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
 #define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
 
 #define PKCS7_set_detached(p,v) \
@@ -208,14 +229,14 @@ typedef struct pkcs7_st
                 PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
 
 #ifdef SSLEAY_MACROS
-
+#ifndef PKCS7_ISSUER_AND_SERIAL_digest
 #define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
         ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
                         (char *)data,md,len)
 #endif
+#endif
 
 
-#ifndef NOPROTO
 PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void );
 void                    PKCS7_ISSUER_AND_SERIAL_free(
                                 PKCS7_ISSUER_AND_SERIAL *a);
@@ -229,11 +250,11 @@ PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,EVP_MD *type,
         unsigned char *md,unsigned int *len);
 #ifndef NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 *p7);
+PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
 int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
 #endif
 PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 *p7);
+PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
 int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
 #endif
 
@@ -314,107 +335,45 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
 int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
 int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataSign(PKCS7 *p7, BIO *bio);
 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
         BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si); 
+int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
+                                                                X509 *x509);
 
 BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-/*int PKCS7_DataFinal(PKCS7 *p7, BIO *bio); */
+int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
+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);
 int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, EVP_CIPHER *cipher);
-
+int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
 
+PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
+ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
+int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si,int nid,int type,
+        void *data);
+int PKCS7_add_attribute (PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
+        void *value);
+ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
+ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
+int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
+                                STACK_OF(X509_ATTRIBUTE) *sk);
+int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
 
-#else
 
-PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new();
-void                    PKCS7_ISSUER_AND_SERIAL_free();
-int                     i2d_PKCS7_ISSUER_AND_SERIAL();
-PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL();
-
-#ifndef SSLEAY_MACROS
-int                     PKCS7_ISSUER_AND_SERIAL_digest();
-#ifndef NO_FP_API
-PKCS7 *d2i_PKCS7_fp();
-int i2d_PKCS7_fp();
-#endif
-PKCS7 *PKCS7_dup();
-PKCS7 *d2i_PKCS7_bio();
-int i2d_PKCS7_bio();
-
-#endif
-
-PKCS7_SIGNER_INFO       *PKCS7_SIGNER_INFO_new();
-void                    PKCS7_SIGNER_INFO_free();
-int                     i2d_PKCS7_SIGNER_INFO();
-PKCS7_SIGNER_INFO       *d2i_PKCS7_SIGNER_INFO();
-PKCS7_RECIP_INFO        *PKCS7_RECIP_INFO_new();
-void                    PKCS7_RECIP_INFO_free();
-int                     i2d_PKCS7_RECIP_INFO();
-PKCS7_RECIP_INFO        *d2i_PKCS7_RECIP_INFO();
-PKCS7_SIGNED            *PKCS7_SIGNED_new();
-void                    PKCS7_SIGNED_free();
-int                     i2d_PKCS7_SIGNED();
-PKCS7_SIGNED            *d2i_PKCS7_SIGNED();
-PKCS7_ENC_CONTENT       *PKCS7_ENC_CONTENT_new();
-void                    PKCS7_ENC_CONTENT_free();
-int                     i2d_PKCS7_ENC_CONTENT();
-PKCS7_ENC_CONTENT       *d2i_PKCS7_ENC_CONTENT();
-PKCS7_ENVELOPE          *PKCS7_ENVELOPE_new();
-void                    PKCS7_ENVELOPE_free();
-int                     i2d_PKCS7_ENVELOPE();
-PKCS7_ENVELOPE          *d2i_PKCS7_ENVELOPE();
-PKCS7_SIGN_ENVELOPE     *PKCS7_SIGN_ENVELOPE_new();
-void                    PKCS7_SIGN_ENVELOPE_free();
-int                     i2d_PKCS7_SIGN_ENVELOPE();
-PKCS7_SIGN_ENVELOPE     *d2i_PKCS7_SIGN_ENVELOPE();
-PKCS7_DIGEST            *PKCS7_DIGEST_new();
-void                    PKCS7_DIGEST_free();
-int                     i2d_PKCS7_DIGEST();
-PKCS7_DIGEST            *d2i_PKCS7_DIGEST();
-PKCS7_ENCRYPT           *PKCS7_ENCRYPT_new();
-void                    PKCS7_ENCRYPT_free();
-int                     i2d_PKCS7_ENCRYPT();
-PKCS7_ENCRYPT           *d2i_PKCS7_ENCRYPT();
-PKCS7                   *PKCS7_new();
-void                    PKCS7_free();
-void                    PKCS7_content_free();
-int                     i2d_PKCS7();
-PKCS7                   *d2i_PKCS7();
-
-void ERR_load_PKCS7_strings();
-
-long PKCS7_ctrl();
-int PKCS7_set_type();
-int PKCS7_set_content();
-int PKCS7_SIGNER_INFO_set();
-int PKCS7_add_signer();
-int PKCS7_add_certificate();
-int PKCS7_add_crl();
-int PKCS7_content_new();
-int PKCS7_dataSign();
-int PKCS7_dataVerify();
-BIO *PKCS7_dataInit();
-PKCS7_SIGNER_INFO *PKCS7_add_signature();
-X509 *PKCS7_cert_from_signer_info();
-STACK *PKCS7_get_signer_info();
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient();
-int PKCS7_add_recipient_info();
-int PKCS7_RECIP_INFO_set();
-int PKCS7_set_cipher();
-
-#endif
 
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
 /* Error codes for the PKCS7 functions. */
 
 /* Function codes. */
@@ -423,25 +382,34 @@ int PKCS7_set_cipher();
 #define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 102
 #define PKCS7_F_PKCS7_ADD_SIGNER                         103
 #define PKCS7_F_PKCS7_CTRL                               104
+#define PKCS7_F_PKCS7_DATADECODE                         112
 #define PKCS7_F_PKCS7_DATAINIT                           105
 #define PKCS7_F_PKCS7_DATASIGN                           106
 #define PKCS7_F_PKCS7_DATAVERIFY                         107
 #define PKCS7_F_PKCS7_SET_CIPHER                         108
 #define PKCS7_F_PKCS7_SET_CONTENT                        109
 #define PKCS7_F_PKCS7_SET_TYPE                           110
+#define PKCS7_F_PKCS7_SIGNATUREVERIFY                    113
 
 /* Reason codes. */
-#define PKCS7_R_INTERNAL_ERROR                           100
-#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     101
-#define PKCS7_R_SIGNATURE_FAILURE                        102
-#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               103
-#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   104
-#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            105
-#define PKCS7_R_UNKNOWN_DIGEST_TYPE                      106
-#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  107
-#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 108
-#define PKCS7_R_WRONG_CONTENT_TYPE                       109
- 
+#define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
+#define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH            100
+#define PKCS7_R_DIGEST_FAILURE                           101
+#define PKCS7_R_INTERNAL_ERROR                           102
+#define PKCS7_R_MISSING_CERIPEND_INFO                    103
+#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
+#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
+#define PKCS7_R_SIGNATURE_FAILURE                        105
+#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
+#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
+#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
+#define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
+#define PKCS7_R_UNKNOWN_OPERATION                        110
+#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
+#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
+#define PKCS7_R_WRONG_CONTENT_TYPE                       113
+#define PKCS7_R_WRONG_PKCS7_TYPE                         114
+
 #ifdef  __cplusplus
 }
 #endif