Fix from stable branch.
[openssl.git] / crypto / pkcs7 / pkcs7.h
index c42bd6d..7191fcf 100644 (file)
 #ifndef HEADER_PKCS7_H
 #define HEADER_PKCS7_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
+#include <openssl/asn1.h>
 #include <openssl/bio.h>
-#include <openssl/x509.h>
+#include <openssl/e_os2.h>
 
-#ifdef VMS
-#include <openssl/vms_idhacks.h>
+#include <openssl/symhacks.h>
+#include <openssl/ossl_typ.h>
+
+#ifdef  __cplusplus
+extern "C" {
 #endif
 
-#ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
+#ifdef OPENSSL_SYS_WIN32
+/* Under Win32 thes are defined in wincrypt.h */
 #undef PKCS7_ISSUER_AND_SERIAL
+#undef PKCS7_SIGNER_INFO
 #endif
 
 /*
@@ -209,9 +210,16 @@ typedef struct pkcs7_st
 
                /* NID_pkcs7_encrypted */
                PKCS7_ENCRYPT *encrypted;
+
+               /* Anything else */
+               ASN1_TYPE *other;
                } d;
        } PKCS7;
 
+DECLARE_STACK_OF(PKCS7)
+DECLARE_ASN1_SET_OF(PKCS7)
+DECLARE_PKCS12_STACK_OF(PKCS7)
+
 #define PKCS7_OP_SET_DETACHED_SIGNATURE        1
 #define PKCS7_OP_GET_DETACHED_SIGNATURE        2
 
@@ -219,118 +227,93 @@ typedef struct pkcs7_st
 #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_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
+#define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
 #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_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
+#define PKCS7_type_is_encrypted(a) \
+               (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
+
+#define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
 
 #define PKCS7_set_detached(p,v) \
                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
 #define PKCS7_get_detached(p) \
                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
-
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void );
-void                   PKCS7_ISSUER_AND_SERIAL_free(
-                               PKCS7_ISSUER_AND_SERIAL *a);
-int                    i2d_PKCS7_ISSUER_AND_SERIAL(
-                               PKCS7_ISSUER_AND_SERIAL *a,unsigned char **pp);
-PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(
-                               PKCS7_ISSUER_AND_SERIAL **a,
-                               unsigned char **pp, long length);
-
-#ifndef SSLEAY_MACROS
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,EVP_MD *type,
+#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
+
+/* S/MIME related flags */
+
+#define PKCS7_TEXT             0x1
+#define PKCS7_NOCERTS          0x2
+#define PKCS7_NOSIGS           0x4
+#define PKCS7_NOCHAIN          0x8
+#define PKCS7_NOINTERN         0x10
+#define PKCS7_NOVERIFY         0x20
+#define PKCS7_DETACHED         0x40
+#define PKCS7_BINARY           0x80
+#define PKCS7_NOATTR           0x100
+#define        PKCS7_NOSMIMECAP        0x200
+#define PKCS7_NOOLDMIMETYPE    0x400
+#define PKCS7_CRLFEOL          0x800
+#define PKCS7_STREAM           0x1000
+#define PKCS7_NOCRL            0x2000
+#define PKCS7_PARTIAL          0x4000
+#define PKCS7_REUSE_DIGEST     0x8000
+
+/* Flags: for compatibility with older code */
+
+#define SMIME_TEXT     PKCS7_TEXT
+#define SMIME_NOCERTS  PKCS7_NOCERTS
+#define SMIME_NOSIGS   PKCS7_NOSIGS
+#define SMIME_NOCHAIN  PKCS7_NOCHAIN
+#define SMIME_NOINTERN PKCS7_NOINTERN
+#define SMIME_NOVERIFY PKCS7_NOVERIFY
+#define SMIME_DETACHED PKCS7_DETACHED
+#define SMIME_BINARY   PKCS7_BINARY
+#define SMIME_NOATTR   PKCS7_NOATTR
+
+DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
+
+int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
        unsigned char *md,unsigned int *len);
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 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);
 int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
-#endif
+int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
+int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
 
-PKCS7_SIGNER_INFO      *PKCS7_SIGNER_INFO_new(void);
-void                   PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a);
-int                    i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a,
-                               unsigned char **pp);
-PKCS7_SIGNER_INFO      *d2i_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO **a,
-                               unsigned char **pp,long length);
-
-PKCS7_RECIP_INFO       *PKCS7_RECIP_INFO_new(void);
-void                   PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a);
-int                    i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a,
-                               unsigned char **pp);
-PKCS7_RECIP_INFO       *d2i_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO **a,
-                               unsigned char **pp,long length);
-
-PKCS7_SIGNED           *PKCS7_SIGNED_new(void);
-void                   PKCS7_SIGNED_free(PKCS7_SIGNED *a);
-int                    i2d_PKCS7_SIGNED(PKCS7_SIGNED *a,
-                               unsigned char **pp);
-PKCS7_SIGNED           *d2i_PKCS7_SIGNED(PKCS7_SIGNED **a,
-                               unsigned char **pp,long length);
-
-PKCS7_ENC_CONTENT      *PKCS7_ENC_CONTENT_new(void);
-void                   PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a);
-int                    i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a,
-                               unsigned char **pp);
-PKCS7_ENC_CONTENT      *d2i_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT **a,
-                               unsigned char **pp,long length);
-
-PKCS7_ENVELOPE         *PKCS7_ENVELOPE_new(void);
-void                   PKCS7_ENVELOPE_free(PKCS7_ENVELOPE *a);
-int                    i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a,
-                               unsigned char **pp);
-PKCS7_ENVELOPE         *d2i_PKCS7_ENVELOPE(PKCS7_ENVELOPE **a,
-                               unsigned char **pp,long length);
-
-PKCS7_SIGN_ENVELOPE    *PKCS7_SIGN_ENVELOPE_new(void);
-void                   PKCS7_SIGN_ENVELOPE_free(PKCS7_SIGN_ENVELOPE *a);
-int                    i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a,
-                               unsigned char **pp);
-PKCS7_SIGN_ENVELOPE    *d2i_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE **a,
-                               unsigned char **pp,long length);
-
-PKCS7_DIGEST           *PKCS7_DIGEST_new(void);
-void                   PKCS7_DIGEST_free(PKCS7_DIGEST *a);
-int                    i2d_PKCS7_DIGEST(PKCS7_DIGEST *a,
-                               unsigned char **pp);
-PKCS7_DIGEST           *d2i_PKCS7_DIGEST(PKCS7_DIGEST **a,
-                               unsigned char **pp,long length);
-
-PKCS7_ENCRYPT          *PKCS7_ENCRYPT_new(void);
-void                   PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a);
-int                    i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a,
-                               unsigned char **pp);
-PKCS7_ENCRYPT          *d2i_PKCS7_ENCRYPT(PKCS7_ENCRYPT **a,
-                               unsigned char **pp,long length);
-
-PKCS7                  *PKCS7_new(void);
-void                   PKCS7_free(PKCS7 *a);
-void                   PKCS7_content_free(PKCS7 *a);
-int                    i2d_PKCS7(PKCS7 *a,
-                               unsigned char **pp);
-PKCS7                  *d2i_PKCS7(PKCS7 **a,
-                               unsigned char **pp,long length);
+DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
+DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
+DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNED)
+DECLARE_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
+DECLARE_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
+DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
+DECLARE_ASN1_FUNCTIONS(PKCS7_DIGEST)
+DECLARE_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
+DECLARE_ASN1_FUNCTIONS(PKCS7)
 
-void ERR_load_PKCS7_strings(void);
+DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
+DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
 
+DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
+DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
 
 int PKCS7_set_type(PKCS7 *p7, int type);
+int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
 int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-       EVP_MD *dgst);
+       const EVP_MD *dgst);
+int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
 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);
@@ -346,14 +329,19 @@ 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);
+       EVP_PKEY *pkey, const EVP_MD *dgst);
 X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
+int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
 
 PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
+void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
+                                       X509_ALGOR **pdig, X509_ALGOR **psig);
+void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
 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, const EVP_CIPHER *cipher);
+int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
 
 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);
@@ -368,38 +356,135 @@ int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
 int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
 
 
+PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
+                                                       BIO *data, int flags);
+
+PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
+                       X509 *signcert, EVP_PKEY *pkey, const EVP_MD *md,
+                       int flags);
+
+int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
+int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
+                                       BIO *indata, BIO *out, int flags);
+STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
+PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
+                                                               int flags);
+int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
+
+int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
+                             STACK_OF(X509_ALGOR) *cap);
+STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
+int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
+
+int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
+int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
+int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
+                               const unsigned char *md, int mdlen);
+
+int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
+PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
+int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
+int SMIME_text(BIO *in, BIO *out);
+
+BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
+
 
 /* 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.
  */
+void ERR_load_PKCS7_strings(void);
 
 /* Error codes for the PKCS7 functions. */
 
 /* Function codes. */
+#define PKCS7_F_B64_READ_PKCS7                          120
+#define PKCS7_F_B64_WRITE_PKCS7                                 121
+#define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB                  136
+#define PKCS7_F_I2D_PKCS7_BIO_STREAM                    140
+#define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME          135
+#define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP               118
 #define PKCS7_F_PKCS7_ADD_CERTIFICATE                   100
 #define PKCS7_F_PKCS7_ADD_CRL                           101
 #define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                102
+#define PKCS7_F_PKCS7_ADD_SIGNATURE                     131
 #define PKCS7_F_PKCS7_ADD_SIGNER                        103
+#define PKCS7_F_PKCS7_BIO_ADD_DIGEST                    125
+#define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST              138
 #define PKCS7_F_PKCS7_CTRL                              104
 #define PKCS7_F_PKCS7_DATADECODE                        112
+#define PKCS7_F_PKCS7_DATAFINAL                                 128
 #define PKCS7_F_PKCS7_DATAINIT                          105
 #define PKCS7_F_PKCS7_DATASIGN                          106
 #define PKCS7_F_PKCS7_DATAVERIFY                        107
+#define PKCS7_F_PKCS7_DECRYPT                           114
+#define PKCS7_F_PKCS7_DECRYPT_RINFO                     133
+#define PKCS7_F_PKCS7_ENCODE_RINFO                      132
+#define PKCS7_F_PKCS7_ENCRYPT                           115
+#define PKCS7_F_PKCS7_FINAL                             134
+#define PKCS7_F_PKCS7_FIND_DIGEST                       127
+#define PKCS7_F_PKCS7_GET0_SIGNERS                      124
+#define PKCS7_F_PKCS7_RECIP_INFO_SET                    130
 #define PKCS7_F_PKCS7_SET_CIPHER                        108
 #define PKCS7_F_PKCS7_SET_CONTENT                       109
+#define PKCS7_F_PKCS7_SET_DIGEST                        126
 #define PKCS7_F_PKCS7_SET_TYPE                          110
+#define PKCS7_F_PKCS7_SIGN                              116
 #define PKCS7_F_PKCS7_SIGNATUREVERIFY                   113
+#define PKCS7_F_PKCS7_SIGNER_INFO_SET                   129
+#define PKCS7_F_PKCS7_SIGNER_INFO_SIGN                  139
+#define PKCS7_F_PKCS7_SIGN_ADD_SIGNER                   137
+#define PKCS7_F_PKCS7_SIMPLE_SMIMECAP                   119
+#define PKCS7_F_PKCS7_VERIFY                            117
+#define PKCS7_F_SMIME_READ_PKCS7                        122
+#define PKCS7_F_SMIME_TEXT                              123
 
 /* Reason codes. */
+#define PKCS7_R_CERTIFICATE_VERIFY_ERROR                117
+#define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER                 144
 #define PKCS7_R_CIPHER_NOT_INITIALIZED                  116
+#define PKCS7_R_CONTENT_AND_DATA_PRESENT                118
+#define PKCS7_R_CTRL_ERROR                              152
+#define PKCS7_R_DECODE_ERROR                            130
 #define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH           100
+#define PKCS7_R_DECRYPT_ERROR                           119
 #define PKCS7_R_DIGEST_FAILURE                          101
-#define PKCS7_R_INTERNAL_ERROR                          102
+#define PKCS7_R_ENCRYPTION_CTRL_FAILURE                         149
+#define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
+#define PKCS7_R_ERROR_ADDING_RECIPIENT                  120
+#define PKCS7_R_ERROR_SETTING_CIPHER                    121
+#define PKCS7_R_INVALID_MIME_TYPE                       131
+#define PKCS7_R_INVALID_NULL_POINTER                    143
+#define PKCS7_R_MIME_NO_CONTENT_TYPE                    132
+#define PKCS7_R_MIME_PARSE_ERROR                        133
+#define PKCS7_R_MIME_SIG_PARSE_ERROR                    134
 #define PKCS7_R_MISSING_CERIPEND_INFO                   103
+#define PKCS7_R_NO_CONTENT                              122
+#define PKCS7_R_NO_CONTENT_TYPE                                 135
+#define PKCS7_R_NO_DEFAULT_DIGEST                       151
+#define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND           154
+#define PKCS7_R_NO_MULTIPART_BODY_FAILURE               136
+#define PKCS7_R_NO_MULTIPART_BOUNDARY                   137
 #define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE        115
+#define PKCS7_R_NO_RECIPIENT_MATCHES_KEY                146
+#define PKCS7_R_NO_SIGNATURES_ON_DATA                   123
+#define PKCS7_R_NO_SIGNERS                              142
+#define PKCS7_R_NO_SIG_CONTENT_TYPE                     138
 #define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE    104
+#define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR               124
+#define PKCS7_R_PKCS7_ADD_SIGNER_ERROR                  153
+#define PKCS7_R_PKCS7_DATAFINAL                                 126
+#define PKCS7_R_PKCS7_DATAFINAL_ERROR                   125
+#define PKCS7_R_PKCS7_DATASIGN                          145
+#define PKCS7_R_PKCS7_PARSE_ERROR                       139
+#define PKCS7_R_PKCS7_SIG_PARSE_ERROR                   140
+#define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE  127
 #define PKCS7_R_SIGNATURE_FAILURE                       105
+#define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND            128
+#define PKCS7_R_SIGNING_CTRL_FAILURE                    147
+#define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE         148
+#define PKCS7_R_SIG_INVALID_MIME_TYPE                   141
+#define PKCS7_R_SMIME_TEXT_ERROR                        129
 #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
@@ -414,4 +499,3 @@ int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
 }
 #endif
 #endif
-