projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the S/MIME code so it now works again and
[openssl.git] / crypto / pkcs7 / pkcs7.h
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index bc761a054f8ce78bdf7dfcceac351451ebfa3d35..4852c59dac12fca377a35a5407954f97380a64af 100644 (file)
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -62,9 +62,7 @@
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 
-#ifdef VMS
-#include <openssl/vms_idhacks.h>
-#endif
+#include <openssl/symhacks.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -210,6 +208,9 @@ typedef struct pkcs7_st
 
                /* NID_pkcs7_encrypted */
                PKCS7_ENCRYPT *encrypted;
+
+               /* Anything else */
+               ASN1_TYPE *other;
                } d;
        } PKCS7;
 
@@ -224,6 +225,7 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
 #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)
@@ -234,6 +236,8 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
 #define PKCS7_get_detached(p) \
                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
 
+#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
+
 #ifdef SSLEAY_MACROS
 #ifndef PKCS7_ISSUER_AND_SERIAL_digest
 #define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
@@ -244,15 +248,16 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
 
 /* 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_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
 
 /* Flags: for compatibility with older code */
 
@@ -266,14 +271,7 @@ DECLARE_PKCS12_STACK_OF(PKCS7)
 #define SMIME_BINARY   PKCS7_BINARY
 #define SMIME_NOATTR   PKCS7_NOATTR
 
-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);
+DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
 #ifndef SSLEAY_MACROS
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type,
@@ -287,69 +285,18 @@ PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
 int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
 #endif
 
-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)
+
+DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
+DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
 
 void ERR_load_PKCS7_strings(void);
 
@@ -408,7 +355,7 @@ 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 *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
+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 SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
Unnamed repository; edit this file 'description' to name the repository.