Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_cms/lib/CMSDecoder.h b/OSX/libsecurity_cms/lib/CMSDecoder.h
index df1c18724b4a5d809c51a2aa833a5f63d8f76268..7194f28630ddf17b5972deb7d931f5068c3d16b8 100644 (file)
--- a/OSX/libsecurity_cms/lib/CMSDecoder.h
+++ b/OSX/libsecurity_cms/lib/CMSDecoder.h
@@ -121,17 +121,14 @@ OSStatus CMSDecoderCopyDetachedContent(
     __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_NA);
 
 /*
- * Optionally specify a SecKeychainRef, or an array of them, containing
- * intermediate certs to be used in verifying a signed message's signer
- * certs. By default, the default keychain search list is used for this. 
- * Specify an empty CFArrayRef to search *no* keychains for intermediate
- * certs. 
- * If this is called, it must be called before CMSDecoderCopySignerStatus().
+ * This function no longer affects the behavior of the CMS Decoder. Please
+ * discontinue use.
  */
 OSStatus CMSDecoderSetSearchKeychain(
        CMSDecoderRef           cmsDecoder,
        CFTypeRef                       keychainOrArray)
-    __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_NA);
+    __OSX_AVAILABLE_BUT_DEPRECATED_MSG(__MAC_10_5, __MAC_10_13, __IPHONE_NA, __IPHONE_NA,
+                                       "To change the search keychains call SecKeychainSetSearchList.");
 
 /*
  * Obtain the number of signers of a message. A result of zero indicates that
@@ -321,6 +318,8 @@ OSStatus CMSDecoderCopySignerSigningTime(
        CFAbsoluteTime      *signingTime)                       /* RETURNED */
     __OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_NA);
 
+#define TIMESTAMPING_SUPPORTED 1
+#if TIMESTAMPING_SUPPORTED
 /*
  * Obtain the timestamp of signer 'signerIndex' of a CMS message, if
  * present. This timestamp is an authenticated timestamp provided by
@@ -371,6 +370,7 @@ OSStatus CMSDecoderCopySignerTimestampCertificates(
        size_t                          signerIndex,                            /* usually 0 */
        CFArrayRef * __nonnull CF_RETURNS_RETAINED certificateRefs) /* RETURNED */
     __OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_NA);
+#endif // TIMESTAMPING_SUPPORTED
 
 CF_ASSUME_NONNULL_END