Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_smime / lib / SecCmsBase.h

diff --git a/OSX/libsecurity_smime/lib/SecCmsBase.h b/OSX/libsecurity_smime/lib/SecCmsBase.h
index 69c3ed86a30fdd2deb529dd8f1d43a471bd40cc5..8bc62d4c0bb7624d9ddc282afe7622f086d50c75 100644 (file)
--- a/OSX/libsecurity_smime/lib/SecCmsBase.h
+++ b/OSX/libsecurity_smime/lib/SecCmsBase.h
@@ -53,7 +53,7 @@ typedef struct SECOidDataStr SECOidData;
     @typedef
     @discussion XXX We might want to get rid of this alltogether.
  */
-typedef CSSM_X509_ALGORITHM_IDENTIFIER SECAlgorithmID;
+typedef CSSM_X509_ALGORITHM_IDENTIFIER SECAlgorithmID DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
 
 /*!
     @typedef
@@ -155,7 +155,7 @@ typedef void (*SecCmsContentCallback)(void *arg, const char *buf, size_t len);
     @typedef
     @discussion Type of function passed to SecCmsDecode or SecCmsDecoderStart to retrieve the decryption key.  This function is intended to be used for EncryptedData content info's which do not have a key available in a certificate, etc.
  */
-typedef SecSymmetricKeyRef(*SecCmsGetDecryptKeyCallback)(void *arg, SECAlgorithmID *algid);
+typedef SecSymmetricKeyRef(*SecCmsGetDecryptKeyCallback)(void *arg, SECAlgorithmID *algid) DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;
 
 /*!
     @enum SecCmsVerificationStatus
@@ -484,8 +484,12 @@ typedef enum {
     SEC_OID_ECDSA_WITH_SHA384 = 212,
     SEC_OID_ECDSA_WITH_SHA512 = 213,
 
-    /* Apple CMS Attribute */
+    /* Apple CMS Attributes */
     SEC_OID_APPLE_HASH_AGILITY = 214,
+    SEC_OID_APPLE_HASH_AGILITY_V2 = 215,
+
+    /* Apple Expiration Time Attribute */
+    SEC_OID_APPLE_EXPIRATION_TIME = 216,
 
     SEC_OID_TOTAL
 } SECOidTag;