OSDN Git Service

Update OpenSSL to 1.0.2a.
[ffftp/ffftp.git] / contrib / openssl / include / openssl / cms.h
index ee610dd..388c11f 100644 (file)
@@ -1,5 +1,6 @@
 /* crypto/cms/cms.h */\r
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL\r
+/*\r
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL\r
  * project.\r
  */\r
 /* ====================================================================\r
  * ====================================================================\r
  */\r
 \r
-\r
 #ifndef HEADER_CMS_H\r
-#define HEADER_CMS_H\r
+# define HEADER_CMS_H\r
 \r
-#include <openssl/x509.h>\r
+# include <openssl/x509.h>\r
 \r
-#ifdef OPENSSL_NO_CMS\r
-#error CMS is disabled.\r
-#endif\r
+# ifdef OPENSSL_NO_CMS\r
+#  error CMS is disabled.\r
+# endif\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif\r
 \r
-\r
 typedef struct CMS_ContentInfo_st CMS_ContentInfo;\r
 typedef struct CMS_SignerInfo_st CMS_SignerInfo;\r
 typedef struct CMS_CertificateChoices CMS_CertificateChoices;\r
@@ -73,45 +72,50 @@ typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
 typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;\r
 typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;\r
 typedef struct CMS_Receipt_st CMS_Receipt;\r
+typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;\r
+typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;\r
 \r
 DECLARE_STACK_OF(CMS_SignerInfo)\r
 DECLARE_STACK_OF(GENERAL_NAMES)\r
+DECLARE_STACK_OF(CMS_RecipientEncryptedKey)\r
 DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)\r
 DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)\r
 DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)\r
 \r
-#define CMS_SIGNERINFO_ISSUER_SERIAL   0\r
-#define CMS_SIGNERINFO_KEYIDENTIFIER   1\r
+# define CMS_SIGNERINFO_ISSUER_SERIAL    0\r
+# define CMS_SIGNERINFO_KEYIDENTIFIER    1\r
 \r
-#define CMS_RECIPINFO_TRANS            0\r
-#define CMS_RECIPINFO_AGREE            1\r
-#define CMS_RECIPINFO_KEK              2\r
-#define CMS_RECIPINFO_PASS             3\r
-#define CMS_RECIPINFO_OTHER            4\r
+# define CMS_RECIPINFO_NONE              -1\r
+# define CMS_RECIPINFO_TRANS             0\r
+# define CMS_RECIPINFO_AGREE             1\r
+# define CMS_RECIPINFO_KEK               2\r
+# define CMS_RECIPINFO_PASS              3\r
+# define CMS_RECIPINFO_OTHER             4\r
 \r
 /* S/MIME related flags */\r
 \r
-#define CMS_TEXT                       0x1\r
-#define CMS_NOCERTS                    0x2\r
-#define CMS_NO_CONTENT_VERIFY          0x4\r
-#define CMS_NO_ATTR_VERIFY             0x8\r
-#define CMS_NOSIGS                     \\r
-                       (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)\r
-#define CMS_NOINTERN                   0x10\r
-#define CMS_NO_SIGNER_CERT_VERIFY      0x20\r
-#define CMS_NOVERIFY                   0x20\r
-#define CMS_DETACHED                   0x40\r
-#define CMS_BINARY                     0x80\r
-#define CMS_NOATTR                     0x100\r
-#define        CMS_NOSMIMECAP                  0x200\r
-#define CMS_NOOLDMIMETYPE              0x400\r
-#define CMS_CRLFEOL                    0x800\r
-#define CMS_STREAM                     0x1000\r
-#define CMS_NOCRL                      0x2000\r
-#define CMS_PARTIAL                    0x4000\r
-#define CMS_REUSE_DIGEST               0x8000\r
-#define CMS_USE_KEYID                  0x10000\r
-#define CMS_DEBUG_DECRYPT              0x20000\r
+# define CMS_TEXT                        0x1\r
+# define CMS_NOCERTS                     0x2\r
+# define CMS_NO_CONTENT_VERIFY           0x4\r
+# define CMS_NO_ATTR_VERIFY              0x8\r
+# define CMS_NOSIGS                      \\r
+                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)\r
+# define CMS_NOINTERN                    0x10\r
+# define CMS_NO_SIGNER_CERT_VERIFY       0x20\r
+# define CMS_NOVERIFY                    0x20\r
+# define CMS_DETACHED                    0x40\r
+# define CMS_BINARY                      0x80\r
+# define CMS_NOATTR                      0x100\r
+# define CMS_NOSMIMECAP                  0x200\r
+# define CMS_NOOLDMIMETYPE               0x400\r
+# define CMS_CRLFEOL                     0x800\r
+# define CMS_STREAM                      0x1000\r
+# define CMS_NOCRL                       0x2000\r
+# define CMS_PARTIAL                     0x4000\r
+# define CMS_REUSE_DIGEST                0x8000\r
+# define CMS_USE_KEYID                   0x10000\r
+# define CMS_DEBUG_DECRYPT               0x20000\r
+# define CMS_KEY_PARAM                   0x40000\r
 \r
 const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);\r
 \r
@@ -122,120 +126,124 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 int CMS_is_detached(CMS_ContentInfo *cms);\r
 int CMS_set_detached(CMS_ContentInfo *cms, int detached);\r
 \r
-#ifdef HEADER_PEM_H\r
+# ifdef HEADER_PEM_H\r
 DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)\r
-#endif\r
-\r
+# endif\r
 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);\r
 CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);\r
 int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);\r
 \r
 BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);\r
 int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);\r
-int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);\r
+int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,\r
+                             int flags);\r
 CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);\r
 int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);\r
 \r
-int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags);\r
+int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont,\r
+              unsigned int flags);\r
 \r
-CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,\r
-                                               BIO *data, unsigned int flags);\r
+CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey,\r
+                          STACK_OF(X509) *certs, BIO *data,\r
+                          unsigned int flags);\r
 \r
 CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,\r
-                                       X509 *signcert, EVP_PKEY *pkey,\r
-                                       STACK_OF(X509) *certs,\r
-                                       unsigned int flags);\r
+                                  X509 *signcert, EVP_PKEY *pkey,\r
+                                  STACK_OF(X509) *certs, unsigned int flags);\r
 \r
 int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);\r
 CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);\r
 \r
 int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,\r
-                                                       unsigned int flags);\r
+                      unsigned int flags);\r
 CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,\r
-                                                       unsigned int flags);\r
+                                   unsigned int flags);\r
 \r
 int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,\r
-                               const unsigned char *key, size_t keylen,\r
-                               BIO *dcont, BIO *out, unsigned int flags);\r
+                              const unsigned char *key, size_t keylen,\r
+                              BIO *dcont, BIO *out, unsigned int flags);\r
 \r
 CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,\r
-                                       const unsigned char *key, size_t keylen,\r
-                                       unsigned int flags);\r
+                                           const unsigned char *key,\r
+                                           size_t keylen, unsigned int flags);\r
 \r
 int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,\r
-                               const unsigned char *key, size_t keylen);\r
+                               const unsigned char *key, size_t keylen);\r
 \r
 int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,\r
-                X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);\r
+               X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);\r
 \r
 int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,\r
-                       STACK_OF(X509) *certs,\r
-                       X509_STORE *store, unsigned int flags);\r
+                       STACK_OF(X509) *certs,\r
+                       X509_STORE *store, unsigned int flags);\r
 \r
 STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);\r
 \r
 CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,\r
-                               const EVP_CIPHER *cipher, unsigned int flags);\r
+                             const EVP_CIPHER *cipher, unsigned int flags);\r
 \r
 int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,\r
-                               BIO *dcont, BIO *out,\r
-                               unsigned int flags);\r
+                BIO *dcont, BIO *out, unsigned int flags);\r
 \r
 int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);\r
 int CMS_decrypt_set1_key(CMS_ContentInfo *cms,\r
-                               unsigned char *key, size_t keylen,\r
-                               unsigned char *id, size_t idlen);\r
+                         unsigned char *key, size_t keylen,\r
+                         unsigned char *id, size_t idlen);\r
 int CMS_decrypt_set1_password(CMS_ContentInfo *cms,\r
-                               unsigned char *pass, ossl_ssize_t passlen);\r
+                              unsigned char *pass, ossl_ssize_t passlen);\r
 \r
 STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);\r
 int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);\r
+EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri);\r
 CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);\r
 CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,\r
-                                       X509 *recip, unsigned int flags);\r
+                                           X509 *recip, unsigned int flags);\r
 int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);\r
 int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);\r
 int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,\r
-                                       EVP_PKEY **pk, X509 **recip,\r
-                                       X509_ALGOR **palg);\r
+                                     EVP_PKEY **pk, X509 **recip,\r
+                                     X509_ALGOR **palg);\r
 int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,\r
-                                       ASN1_OCTET_STRING **keyid,\r
-                                       X509_NAME **issuer, ASN1_INTEGER **sno);\r
+                                          ASN1_OCTET_STRING **keyid,\r
+                                          X509_NAME **issuer,\r
+                                          ASN1_INTEGER **sno);\r
 \r
 CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,\r
-                                       unsigned char *key, size_t keylen,\r
-                                       unsigned char *id, size_t idlen,\r
-                                       ASN1_GENERALIZEDTIME *date,\r
-                                       ASN1_OBJECT *otherTypeId,\r
-                                       ASN1_TYPE *otherType);\r
+                                          unsigned char *key, size_t keylen,\r
+                                          unsigned char *id, size_t idlen,\r
+                                          ASN1_GENERALIZEDTIME *date,\r
+                                          ASN1_OBJECT *otherTypeId,\r
+                                          ASN1_TYPE *otherType);\r
 \r
 int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,\r
-                                       X509_ALGOR **palg,\r
-                                       ASN1_OCTET_STRING **pid,\r
-                                       ASN1_GENERALIZEDTIME **pdate,\r
-                                       ASN1_OBJECT **potherid,\r
-                                       ASN1_TYPE **pothertype);\r
+                                    X509_ALGOR **palg,\r
+                                    ASN1_OCTET_STRING **pid,\r
+                                    ASN1_GENERALIZEDTIME **pdate,\r
+                                    ASN1_OBJECT **potherid,\r
+                                    ASN1_TYPE **pothertype);\r
 \r
 int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,\r
-                               unsigned char *key, size_t keylen);\r
+                               unsigned char *key, size_t keylen);\r
 \r
 int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,\r
-                                       const unsigned char *id, size_t idlen);\r
+                                   const unsigned char *id, size_t idlen);\r
 \r
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,\r
-                                       unsigned char *pass,\r
-                                       ossl_ssize_t passlen);\r
+                                    unsigned char *pass,\r
+                                    ossl_ssize_t passlen);\r
 \r
 CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,\r
-                                       int iter, int wrap_nid, int pbe_nid,\r
-                                       unsigned char *pass,\r
-                                       ossl_ssize_t passlen,\r
-                                       const EVP_CIPHER *kekciph);\r
+                                               int iter, int wrap_nid,\r
+                                               int pbe_nid,\r
+                                               unsigned char *pass,\r
+                                               ossl_ssize_t passlen,\r
+                                               const EVP_CIPHER *kekciph);\r
 \r
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);\r
+int CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);\r
 \r
 int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,\r
-                                                       unsigned int flags);\r
+                   unsigned int flags);\r
 CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);\r
 \r
 int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);\r
@@ -253,86 +261,121 @@ STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
 \r
 int CMS_SignedData_init(CMS_ContentInfo *cms);\r
 CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,\r
-                       X509 *signer, EVP_PKEY *pk, const EVP_MD *md,\r
-                       unsigned int flags);\r
+                                X509 *signer, EVP_PKEY *pk, const EVP_MD *md,\r
+                                unsigned int flags);\r
+EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si);\r
+EVP_MD_CTX *CMS_SignerInfo_get0_md_ctx(CMS_SignerInfo *si);\r
 STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);\r
 \r
 void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);\r
 int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,\r
-                                       ASN1_OCTET_STRING **keyid,\r
-                                       X509_NAME **issuer, ASN1_INTEGER **sno);\r
+                                  ASN1_OCTET_STRING **keyid,\r
+                                  X509_NAME **issuer, ASN1_INTEGER **sno);\r
 int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);\r
 int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,\r
-                                       unsigned int flags);\r
-void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,\r
-                                       X509_ALGOR **pdig, X509_ALGOR **psig);\r
+                           unsigned int flags);\r
+void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,\r
+                              X509 **signer, X509_ALGOR **pdig,\r
+                              X509_ALGOR **psig);\r
+ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si);\r
 int CMS_SignerInfo_sign(CMS_SignerInfo *si);\r
 int CMS_SignerInfo_verify(CMS_SignerInfo *si);\r
 int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);\r
 \r
 int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);\r
 int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,\r
-                               int algnid, int keysize);\r
+                            int algnid, int keysize);\r
 int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);\r
 \r
 int CMS_signed_get_attr_count(const CMS_SignerInfo *si);\r
 int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,\r
-                         int lastpos);\r
+                               int lastpos);\r
 int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,\r
-                         int lastpos);\r
+                               int lastpos);\r
 X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);\r
 X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);\r
 int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);\r
 int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,\r
-                       const ASN1_OBJECT *obj, int type,\r
-                       const void *bytes, int len);\r
+                                const ASN1_OBJECT *obj, int type,\r
+                                const void *bytes, int len);\r
 int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,\r
-                       int nid, int type,\r
-                       const void *bytes, int len);\r
+                                int nid, int type,\r
+                                const void *bytes, int len);\r
 int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,\r
-                       const char *attrname, int type,\r
-                       const void *bytes, int len);\r
+                                const char *attrname, int type,\r
+                                const void *bytes, int len);\r
 void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,\r
-                                       int lastpos, int type);\r
+                                  int lastpos, int type);\r
 \r
 int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);\r
 int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,\r
-                         int lastpos);\r
+                                 int lastpos);\r
 int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,\r
-                         int lastpos);\r
+                                 int lastpos);\r
 X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);\r
 X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);\r
 int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);\r
 int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,\r
-                       const ASN1_OBJECT *obj, int type,\r
-                       const void *bytes, int len);\r
+                                  const ASN1_OBJECT *obj, int type,\r
+                                  const void *bytes, int len);\r
 int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,\r
-                       int nid, int type,\r
-                       const void *bytes, int len);\r
+                                  int nid, int type,\r
+                                  const void *bytes, int len);\r
 int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,\r
-                       const char *attrname, int type,\r
-                       const void *bytes, int len);\r
+                                  const char *attrname, int type,\r
+                                  const void *bytes, int len);\r
 void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,\r
-                                       int lastpos, int type);\r
+                                    int lastpos, int type);\r
 \r
-#ifdef HEADER_X509V3_H\r
+# ifdef HEADER_X509V3_H\r
 \r
 int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);\r
 CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,\r
-                               int allorfirst,\r
-                               STACK_OF(GENERAL_NAMES) *receiptList,\r
-                               STACK_OF(GENERAL_NAMES) *receiptsTo);\r
+                                               int allorfirst,\r
+                                               STACK_OF(GENERAL_NAMES)\r
+                                               *receiptList, STACK_OF(GENERAL_NAMES)\r
+                                               *receiptsTo);\r
 int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);\r
 void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,\r
-                                       ASN1_STRING **pcid,\r
-                                       int *pallorfirst,\r
-                                       STACK_OF(GENERAL_NAMES) **plist,\r
-                                       STACK_OF(GENERAL_NAMES) **prto);\r
-\r
-#endif\r
+                                    ASN1_STRING **pcid,\r
+                                    int *pallorfirst,\r
+                                    STACK_OF(GENERAL_NAMES) **plist,\r
+                                    STACK_OF(GENERAL_NAMES) **prto);\r
+# endif\r
+int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,\r
+                                    X509_ALGOR **palg,\r
+                                    ASN1_OCTET_STRING **pukm);\r
+STACK_OF(CMS_RecipientEncryptedKey)\r
+*CMS_RecipientInfo_kari_get0_reks(CMS_RecipientInfo *ri);\r
+\r
+int CMS_RecipientInfo_kari_get0_orig_id(CMS_RecipientInfo *ri,\r
+                                        X509_ALGOR **pubalg,\r
+                                        ASN1_BIT_STRING **pubkey,\r
+                                        ASN1_OCTET_STRING **keyid,\r
+                                        X509_NAME **issuer,\r
+                                        ASN1_INTEGER **sno);\r
+\r
+int CMS_RecipientInfo_kari_orig_id_cmp(CMS_RecipientInfo *ri, X509 *cert);\r
+\r
+int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,\r
+                                      ASN1_OCTET_STRING **keyid,\r
+                                      ASN1_GENERALIZEDTIME **tm,\r
+                                      CMS_OtherKeyAttribute **other,\r
+                                      X509_NAME **issuer, ASN1_INTEGER **sno);\r
+int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,\r
+                                       X509 *cert);\r
+int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk);\r
+EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri);\r
+int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,\r
+                                   CMS_RecipientInfo *ri,\r
+                                   CMS_RecipientEncryptedKey *rek);\r
+\r
+int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,\r
+                          ASN1_OCTET_STRING *ukm, int keylen);\r
 \r
 /* BEGIN ERROR CODES */\r
-/* The following lines are auto generated by the script mkerr.pl. Any changes\r
+/*\r
+ * The following lines are auto generated by the script mkerr.pl. Any changes\r
  * made after this point may be overwritten when the script is next run.\r
  */\r
 void ERR_load_CMS_strings(void);\r
@@ -340,160 +383,171 @@ void ERR_load_CMS_strings(void);
 /* Error codes for the CMS functions. */\r
 \r
 /* Function codes. */\r
-#define CMS_F_CHECK_CONTENT                             99\r
-#define CMS_F_CMS_ADD0_CERT                             164\r
-#define CMS_F_CMS_ADD0_RECIPIENT_KEY                    100\r
-#define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD               165\r
-#define CMS_F_CMS_ADD1_RECEIPTREQUEST                   158\r
-#define CMS_F_CMS_ADD1_RECIPIENT_CERT                   101\r
-#define CMS_F_CMS_ADD1_SIGNER                           102\r
-#define CMS_F_CMS_ADD1_SIGNINGTIME                      103\r
-#define CMS_F_CMS_COMPRESS                              104\r
-#define CMS_F_CMS_COMPRESSEDDATA_CREATE                         105\r
-#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO               106\r
-#define CMS_F_CMS_COPY_CONTENT                          107\r
-#define CMS_F_CMS_COPY_MESSAGEDIGEST                    108\r
-#define CMS_F_CMS_DATA                                  109\r
-#define CMS_F_CMS_DATAFINAL                             110\r
-#define CMS_F_CMS_DATAINIT                              111\r
-#define CMS_F_CMS_DECRYPT                               112\r
-#define CMS_F_CMS_DECRYPT_SET1_KEY                      113\r
-#define CMS_F_CMS_DECRYPT_SET1_PASSWORD                         166\r
-#define CMS_F_CMS_DECRYPT_SET1_PKEY                     114\r
-#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX              115\r
-#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO              116\r
-#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                         117\r
-#define CMS_F_CMS_DIGEST_VERIFY                                 118\r
-#define CMS_F_CMS_ENCODE_RECEIPT                        161\r
-#define CMS_F_CMS_ENCRYPT                               119\r
-#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO             120\r
-#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                         121\r
-#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                         122\r
-#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                123\r
-#define CMS_F_CMS_ENVELOPEDDATA_CREATE                  124\r
-#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                125\r
-#define CMS_F_CMS_ENVELOPED_DATA_INIT                   126\r
-#define CMS_F_CMS_FINAL                                         127\r
-#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES              128\r
-#define CMS_F_CMS_GET0_CONTENT                          129\r
-#define CMS_F_CMS_GET0_ECONTENT_TYPE                    130\r
-#define CMS_F_CMS_GET0_ENVELOPED                        131\r
-#define CMS_F_CMS_GET0_REVOCATION_CHOICES               132\r
-#define CMS_F_CMS_GET0_SIGNED                           133\r
-#define CMS_F_CMS_MSGSIGDIGEST_ADD1                     162\r
-#define CMS_F_CMS_RECEIPTREQUEST_CREATE0                159\r
-#define CMS_F_CMS_RECEIPT_VERIFY                        160\r
-#define CMS_F_CMS_RECIPIENTINFO_DECRYPT                         134\r
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT           135\r
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT           136\r
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID           137\r
-#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP            138\r
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP           139\r
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT            140\r
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT            141\r
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS          142\r
-#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID     143\r
-#define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT              167\r
-#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                144\r
-#define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD           168\r
-#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY               145\r
-#define CMS_F_CMS_SET1_SIGNERIDENTIFIER                         146\r
-#define CMS_F_CMS_SET_DETACHED                          147\r
-#define CMS_F_CMS_SIGN                                  148\r
-#define CMS_F_CMS_SIGNED_DATA_INIT                      149\r
-#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN               150\r
-#define CMS_F_CMS_SIGNERINFO_SIGN                       151\r
-#define CMS_F_CMS_SIGNERINFO_VERIFY                     152\r
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                153\r
-#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT             154\r
-#define CMS_F_CMS_SIGN_RECEIPT                          163\r
-#define CMS_F_CMS_STREAM                                155\r
-#define CMS_F_CMS_UNCOMPRESS                            156\r
-#define CMS_F_CMS_VERIFY                                157\r
+# define CMS_F_CHECK_CONTENT                              99\r
+# define CMS_F_CMS_ADD0_CERT                              164\r
+# define CMS_F_CMS_ADD0_RECIPIENT_KEY                     100\r
+# define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD                165\r
+# define CMS_F_CMS_ADD1_RECEIPTREQUEST                    158\r
+# define CMS_F_CMS_ADD1_RECIPIENT_CERT                    101\r
+# define CMS_F_CMS_ADD1_SIGNER                            102\r
+# define CMS_F_CMS_ADD1_SIGNINGTIME                       103\r
+# define CMS_F_CMS_COMPRESS                               104\r
+# define CMS_F_CMS_COMPRESSEDDATA_CREATE                  105\r
+# define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                106\r
+# define CMS_F_CMS_COPY_CONTENT                           107\r
+# define CMS_F_CMS_COPY_MESSAGEDIGEST                     108\r
+# define CMS_F_CMS_DATA                                   109\r
+# define CMS_F_CMS_DATAFINAL                              110\r
+# define CMS_F_CMS_DATAINIT                               111\r
+# define CMS_F_CMS_DECRYPT                                112\r
+# define CMS_F_CMS_DECRYPT_SET1_KEY                       113\r
+# define CMS_F_CMS_DECRYPT_SET1_PASSWORD                  166\r
+# define CMS_F_CMS_DECRYPT_SET1_PKEY                      114\r
+# define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               115\r
+# define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               116\r
+# define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  117\r
+# define CMS_F_CMS_DIGEST_VERIFY                          118\r
+# define CMS_F_CMS_ENCODE_RECEIPT                         161\r
+# define CMS_F_CMS_ENCRYPT                                119\r
+# define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              120\r
+# define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  121\r
+# define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  122\r
+# define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 123\r
+# define CMS_F_CMS_ENVELOPEDDATA_CREATE                   124\r
+# define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 125\r
+# define CMS_F_CMS_ENVELOPED_DATA_INIT                    126\r
+# define CMS_F_CMS_ENV_ASN1_CTRL                          171\r
+# define CMS_F_CMS_FINAL                                  127\r
+# define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               128\r
+# define CMS_F_CMS_GET0_CONTENT                           129\r
+# define CMS_F_CMS_GET0_ECONTENT_TYPE                     130\r
+# define CMS_F_CMS_GET0_ENVELOPED                         131\r
+# define CMS_F_CMS_GET0_REVOCATION_CHOICES                132\r
+# define CMS_F_CMS_GET0_SIGNED                            133\r
+# define CMS_F_CMS_MSGSIGDIGEST_ADD1                      162\r
+# define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 159\r
+# define CMS_F_CMS_RECEIPT_VERIFY                         160\r
+# define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  134\r
+# define CMS_F_CMS_RECIPIENTINFO_ENCRYPT                  169\r
+# define CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT             178\r
+# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG            175\r
+# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID        173\r
+# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS           172\r
+# define CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP         174\r
+# define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            135\r
+# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            136\r
+# define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            137\r
+# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             138\r
+# define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            139\r
+# define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             140\r
+# define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             141\r
+# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           142\r
+# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      143\r
+# define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT               167\r
+# define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 144\r
+# define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD            168\r
+# define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                145\r
+# define CMS_F_CMS_SD_ASN1_CTRL                           170\r
+# define CMS_F_CMS_SET1_IAS                               176\r
+# define CMS_F_CMS_SET1_KEYID                             177\r
+# define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  146\r
+# define CMS_F_CMS_SET_DETACHED                           147\r
+# define CMS_F_CMS_SIGN                                   148\r
+# define CMS_F_CMS_SIGNED_DATA_INIT                       149\r
+# define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                150\r
+# define CMS_F_CMS_SIGNERINFO_SIGN                        151\r
+# define CMS_F_CMS_SIGNERINFO_VERIFY                      152\r
+# define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153\r
+# define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154\r
+# define CMS_F_CMS_SIGN_RECEIPT                           163\r
+# define CMS_F_CMS_STREAM                                 155\r
+# define CMS_F_CMS_UNCOMPRESS                             156\r
+# define CMS_F_CMS_VERIFY                                 157\r
 \r
 /* Reason codes. */\r
-#define CMS_R_ADD_SIGNER_ERROR                          99\r
-#define CMS_R_CERTIFICATE_ALREADY_PRESENT               175\r
-#define CMS_R_CERTIFICATE_HAS_NO_KEYID                  160\r
-#define CMS_R_CERTIFICATE_VERIFY_ERROR                  100\r
-#define CMS_R_CIPHER_INITIALISATION_ERROR               101\r
-#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR     102\r
-#define CMS_R_CMS_DATAFINAL_ERROR                       103\r
-#define CMS_R_CMS_LIB                                   104\r
-#define CMS_R_CONTENTIDENTIFIER_MISMATCH                170\r
-#define CMS_R_CONTENT_NOT_FOUND                                 105\r
-#define CMS_R_CONTENT_TYPE_MISMATCH                     171\r
-#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA          106\r
-#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA           107\r
-#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA              108\r
-#define CMS_R_CONTENT_VERIFY_ERROR                      109\r
-#define CMS_R_CTRL_ERROR                                110\r
-#define CMS_R_CTRL_FAILURE                              111\r
-#define CMS_R_DECRYPT_ERROR                             112\r
-#define CMS_R_DIGEST_ERROR                              161\r
-#define CMS_R_ERROR_GETTING_PUBLIC_KEY                  113\r
-#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE     114\r
-#define CMS_R_ERROR_SETTING_KEY                                 115\r
-#define CMS_R_ERROR_SETTING_RECIPIENTINFO               116\r
-#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH              117\r
-#define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER          176\r
-#define CMS_R_INVALID_KEY_LENGTH                        118\r
-#define CMS_R_MD_BIO_INIT_ERROR                                 119\r
-#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH      120\r
-#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                121\r
-#define CMS_R_MSGSIGDIGEST_ERROR                        172\r
-#define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE                 162\r
-#define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                         163\r
-#define CMS_R_NEED_ONE_SIGNER                           164\r
-#define CMS_R_NOT_A_SIGNED_RECEIPT                      165\r
-#define CMS_R_NOT_ENCRYPTED_DATA                        122\r
-#define CMS_R_NOT_KEK                                   123\r
-#define CMS_R_NOT_KEY_TRANSPORT                                 124\r
-#define CMS_R_NOT_PWRI                                  177\r
-#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE           125\r
-#define CMS_R_NO_CIPHER                                         126\r
-#define CMS_R_NO_CONTENT                                127\r
-#define CMS_R_NO_CONTENT_TYPE                           173\r
-#define CMS_R_NO_DEFAULT_DIGEST                                 128\r
-#define CMS_R_NO_DIGEST_SET                             129\r
-#define CMS_R_NO_KEY                                    130\r
-#define CMS_R_NO_KEY_OR_CERT                            174\r
-#define CMS_R_NO_MATCHING_DIGEST                        131\r
-#define CMS_R_NO_MATCHING_RECIPIENT                     132\r
-#define CMS_R_NO_MATCHING_SIGNATURE                     166\r
-#define CMS_R_NO_MSGSIGDIGEST                           167\r
-#define CMS_R_NO_PASSWORD                               178\r
-#define CMS_R_NO_PRIVATE_KEY                            133\r
-#define CMS_R_NO_PUBLIC_KEY                             134\r
-#define CMS_R_NO_RECEIPT_REQUEST                        168\r
-#define CMS_R_NO_SIGNERS                                135\r
-#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE    136\r
-#define CMS_R_RECEIPT_DECODE_ERROR                      169\r
-#define CMS_R_RECIPIENT_ERROR                           137\r
-#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND              138\r
-#define CMS_R_SIGNFINAL_ERROR                           139\r
-#define CMS_R_SMIME_TEXT_ERROR                          140\r
-#define CMS_R_STORE_INIT_ERROR                          141\r
-#define CMS_R_TYPE_NOT_COMPRESSED_DATA                  142\r
-#define CMS_R_TYPE_NOT_DATA                             143\r
-#define CMS_R_TYPE_NOT_DIGESTED_DATA                    144\r
-#define CMS_R_TYPE_NOT_ENCRYPTED_DATA                   145\r
-#define CMS_R_TYPE_NOT_ENVELOPED_DATA                   146\r
-#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                147\r
-#define CMS_R_UNKNOWN_CIPHER                            148\r
-#define CMS_R_UNKNOWN_DIGEST_ALGORIHM                   149\r
-#define CMS_R_UNKNOWN_ID                                150\r
-#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM                 151\r
-#define CMS_R_UNSUPPORTED_CONTENT_TYPE                  152\r
-#define CMS_R_UNSUPPORTED_KEK_ALGORITHM                         153\r
-#define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM      179\r
-#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                154\r
-#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE             155\r
-#define CMS_R_UNSUPPORTED_TYPE                          156\r
-#define CMS_R_UNWRAP_ERROR                              157\r
-#define CMS_R_UNWRAP_FAILURE                            180\r
-#define CMS_R_VERIFICATION_FAILURE                      158\r
-#define CMS_R_WRAP_ERROR                                159\r
+# define CMS_R_ADD_SIGNER_ERROR                           99\r
+# define CMS_R_CERTIFICATE_ALREADY_PRESENT                175\r
+# define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160\r
+# define CMS_R_CERTIFICATE_VERIFY_ERROR                   100\r
+# define CMS_R_CIPHER_INITIALISATION_ERROR                101\r
+# define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102\r
+# define CMS_R_CMS_DATAFINAL_ERROR                        103\r
+# define CMS_R_CMS_LIB                                    104\r
+# define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170\r
+# define CMS_R_CONTENT_NOT_FOUND                          105\r
+# define CMS_R_CONTENT_TYPE_MISMATCH                      171\r
+# define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106\r
+# define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107\r
+# define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108\r
+# define CMS_R_CONTENT_VERIFY_ERROR                       109\r
+# define CMS_R_CTRL_ERROR                                 110\r
+# define CMS_R_CTRL_FAILURE                               111\r
+# define CMS_R_DECRYPT_ERROR                              112\r
+# define CMS_R_DIGEST_ERROR                               161\r
+# define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113\r
+# define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114\r
+# define CMS_R_ERROR_SETTING_KEY                          115\r
+# define CMS_R_ERROR_SETTING_RECIPIENTINFO                116\r
+# define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117\r
+# define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER           176\r
+# define CMS_R_INVALID_KEY_LENGTH                         118\r
+# define CMS_R_MD_BIO_INIT_ERROR                          119\r
+# define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120\r
+# define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121\r
+# define CMS_R_MSGSIGDIGEST_ERROR                         172\r
+# define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162\r
+# define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163\r
+# define CMS_R_NEED_ONE_SIGNER                            164\r
+# define CMS_R_NOT_A_SIGNED_RECEIPT                       165\r
+# define CMS_R_NOT_ENCRYPTED_DATA                         122\r
+# define CMS_R_NOT_KEK                                    123\r
+# define CMS_R_NOT_KEY_AGREEMENT                          181\r
+# define CMS_R_NOT_KEY_TRANSPORT                          124\r
+# define CMS_R_NOT_PWRI                                   177\r
+# define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125\r
+# define CMS_R_NO_CIPHER                                  126\r
+# define CMS_R_NO_CONTENT                                 127\r
+# define CMS_R_NO_CONTENT_TYPE                            173\r
+# define CMS_R_NO_DEFAULT_DIGEST                          128\r
+# define CMS_R_NO_DIGEST_SET                              129\r
+# define CMS_R_NO_KEY                                     130\r
+# define CMS_R_NO_KEY_OR_CERT                             174\r
+# define CMS_R_NO_MATCHING_DIGEST                         131\r
+# define CMS_R_NO_MATCHING_RECIPIENT                      132\r
+# define CMS_R_NO_MATCHING_SIGNATURE                      166\r
+# define CMS_R_NO_MSGSIGDIGEST                            167\r
+# define CMS_R_NO_PASSWORD                                178\r
+# define CMS_R_NO_PRIVATE_KEY                             133\r
+# define CMS_R_NO_PUBLIC_KEY                              134\r
+# define CMS_R_NO_RECEIPT_REQUEST                         168\r
+# define CMS_R_NO_SIGNERS                                 135\r
+# define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136\r
+# define CMS_R_RECEIPT_DECODE_ERROR                       169\r
+# define CMS_R_RECIPIENT_ERROR                            137\r
+# define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138\r
+# define CMS_R_SIGNFINAL_ERROR                            139\r
+# define CMS_R_SMIME_TEXT_ERROR                           140\r
+# define CMS_R_STORE_INIT_ERROR                           141\r
+# define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142\r
+# define CMS_R_TYPE_NOT_DATA                              143\r
+# define CMS_R_TYPE_NOT_DIGESTED_DATA                     144\r
+# define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145\r
+# define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146\r
+# define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147\r
+# define CMS_R_UNKNOWN_CIPHER                             148\r
+# define CMS_R_UNKNOWN_DIGEST_ALGORIHM                    149\r
+# define CMS_R_UNKNOWN_ID                                 150\r
+# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151\r
+# define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152\r
+# define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153\r
+# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179\r
+# define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154\r
+# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE              155\r
+# define CMS_R_UNSUPPORTED_TYPE                           156\r
+# define CMS_R_UNWRAP_ERROR                               157\r
+# define CMS_R_UNWRAP_FAILURE                             180\r
+# define CMS_R_VERIFICATION_FAILURE                       158\r
+# define CMS_R_WRAP_ERROR                                 159\r
 \r
 #ifdef  __cplusplus\r
 }\r