Complete rewrite of the error code generation script. It now runs as a single

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

diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index 01afa5a5c3cd5bf2f53ddcd3c4db75fff2bc4c4b..f21cbe884f46d4658c27d028b01dee84f890e285 100644 (file)
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -63,8 +63,8 @@
 extern "C" {
 #endif
 
-#include "bio.h"
-#include "x509.h"
+#include <openssl/bio.h>
+#include <openssl/x509.h>
 
 /*
 Encryption_ID          DES-CBC
@@ -106,7 +106,7 @@ typedef struct pkcs7_signed_st
        {
        ASN1_INTEGER                    *version;       /* version 1 */
        STACK /* X509_ALGOR's */        *md_algs;       /* md used */
-       STACK /* X509 */                *cert;          /* [ 0 ] */
+       STACK_OF(X509)                  *cert;          /* [ 0 ] */
        STACK /* X509_CRL */            *crl;           /* [ 1 ] */
        STACK /* PKCS7_SIGNER_INFO */   *signer_info;
 
@@ -133,7 +133,7 @@ typedef struct pkcs7_signedandenveloped_st
        {
        ASN1_INTEGER                    *version;       /* version 1 */
        STACK /* X509_ALGOR's */        *md_algs;       /* md used */
-       STACK /* X509 */                *cert;          /* [ 0 ] */
+       STACK_OF(X509)                  *cert;          /* [ 0 ] */
        STACK /* X509_CRL */            *crl;           /* [ 1 ] */
        STACK /* PKCS7_SIGNER_INFO */   *signer_info;
 
@@ -419,6 +419,8 @@ int PKCS7_add_crl();
 int PKCS7_content_new();
 int PKCS7_dataVerify();
 BIO *PKCS7_dataInit();
+int PKCS7_dataFinal();
+BIO *PKCS7_dataDecode();
 PKCS7_SIGNER_INFO *PKCS7_add_signature();
 X509 *PKCS7_cert_from_signer_info();
 STACK *PKCS7_get_signer_info();
@@ -441,6 +443,10 @@ void PKCS7_set_attributes();
 
 
 /* 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. */
@@ -473,7 +479,7 @@ void PKCS7_set_attributes();
 #define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                112
 #define PKCS7_R_WRONG_CONTENT_TYPE                      113
 #define PKCS7_R_WRONG_PKCS7_TYPE                        114
- 
+
 #ifdef  __cplusplus
 }
 #endif