Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_cms / lib / CMSEncoder.h

diff --git a/OSX/libsecurity_cms/lib/CMSEncoder.h b/OSX/libsecurity_cms/lib/CMSEncoder.h
index f24227b253a9fdf9822ae73b3fbb551860320525..32ec916adcf9df2f3f7ebc551020b11bafeb69b0 100644 (file)
--- a/OSX/libsecurity_cms/lib/CMSEncoder.h
+++ b/OSX/libsecurity_cms/lib/CMSEncoder.h
@@ -44,6 +44,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/cssmtype.h>
 #include <stdint.h>
+#include <Availability.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -170,8 +171,7 @@ OSStatus CMSEncoderGetHasDetachedContent(
 OSStatus CMSEncoderSetEncapsulatedContentType(
        CMSEncoderRef           cmsEncoder,
        const CSSM_OID  *eContentType)
-       /* DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER; */
-    __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_NA);
+    API_DEPRECATED_WITH_REPLACEMENT("CMSEncoderSetEncapsulatedContentTypeOID", macos(10.5, 10.7)) API_UNAVAILABLE(ios);
 
 /*
  * Optionally specify an eContentType OID for the inner EncapsulatedData for
@@ -243,7 +243,7 @@ OSStatus CMSEncoderCopySupportingCerts(
  * Standard signed attributes, optionally specified in 
  * CMSEncoderAddSignedAttributes().
  */
-typedef CF_ENUM(uint32_t, CMSSignedAttributes) {
+typedef CF_OPTIONS(uint32_t, CMSSignedAttributes) {
        kCMSAttrNone                                            = 0x0000,
     /* 
      * S/MIME Capabilities - identifies supported signature, encryption, and
@@ -266,7 +266,12 @@ typedef CF_ENUM(uint32_t, CMSSignedAttributes) {
     /*
      * Include the Apple Codesigning Hash Agility.
      */
-    kCMSAttrAppleCodesigningHashAgility = 0x0010
+    kCMSAttrAppleCodesigningHashAgility = 0x0010,
+    kCMSAttrAppleCodesigningHashAgilityV2 = 0x0020,
+    /*
+     * Include the expiration time.
+     */
+    kCMSAttrAppleExpirationTime         = 0x0040,
 };
 
 /*
@@ -365,8 +370,7 @@ OSStatus CMSEncode(
        const void *                content,
        size_t                      contentLen,
        CFDataRef * __nonnull CF_RETURNS_RETAINED encodedContentOut)    /* RETURNED */
-       /* DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER; */
-    __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_NA);
+    API_DEPRECATED_WITH_REPLACEMENT("CMSEncodeContent", macos(10.5, 10.7)) API_UNAVAILABLE(ios);
 
 
 /*