diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-03-18 16:56:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-03-18 16:56:24 +0000 |
| commit | 6a6db513258224651c8e12c43545d368c7456bbc (patch) | |
| tree | 8af5da797e64907778db6738959fed3c30f618dd /include/openssl/cms.h | |
| parent | f0efe2dabd75888cb31ea023f10ed930c2056307 (diff) | |
git-svn-id: http://svn.miranda-ng.org/main/trunk@16502 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/openssl/cms.h')
| -rw-r--r-- | include/openssl/cms.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/openssl/cms.h b/include/openssl/cms.h index e6c7f964bf..f8d55d84d2 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -1,4 +1,3 @@ -/* crypto/cms/cms.h */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -56,6 +55,7 @@ # define HEADER_CMS_H # include <openssl/x509.h> +# include <openssl/x509v3.h> # ifdef OPENSSL_NO_CMS # error CMS is disabled. @@ -75,9 +75,10 @@ typedef struct CMS_Receipt_st CMS_Receipt; typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey; typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute; -DECLARE_STACK_OF(CMS_SignerInfo) -DECLARE_STACK_OF(GENERAL_NAMES) -DECLARE_STACK_OF(CMS_RecipientEncryptedKey) +DEFINE_STACK_OF(CMS_SignerInfo) +DEFINE_STACK_OF(CMS_RecipientEncryptedKey) +DEFINE_STACK_OF(CMS_RecipientInfo) +DEFINE_STACK_OF(CMS_RevocationInfoChoice) DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo) DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest) DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) @@ -116,6 +117,7 @@ DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) # define CMS_USE_KEYID 0x10000 # define CMS_DEBUG_DECRYPT 0x20000 # define CMS_KEY_PARAM 0x40000 +# define CMS_ASCIICRLF 0x80000 const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms); |