X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/e3d460c9de4426da6c630c3ae3f46173a99f82d8..8a50f688fe9358387648fb83fbfecbefe8d32669:/OSX/libsecurity_cms/lib/CMSDecoder.cpp?ds=inline

diff --git a/OSX/libsecurity_cms/lib/CMSDecoder.cpp b/OSX/libsecurity_cms/lib/CMSDecoder.cpp
index a8d81d09..83775b23 100644
--- a/OSX/libsecurity_cms/lib/CMSDecoder.cpp
+++ b/OSX/libsecurity_cms/lib/CMSDecoder.cpp
@@ -66,7 +66,7 @@ struct _CMSDecoder {
 	SecArenaPoolRef		arena;				/* the decoder's arena */
 	SecCmsDecoderRef	decoder;
 	CFDataRef			detachedContent;
-	CFTypeRef			keychainOrArray;	/* from CMSDecoderSetSearchKeychain() */
+	CFTypeRef			keychainOrArray;	/* unused */
 	
 	/*
 	 * The following are valid (and quiescent) after CMSDecoderFinalizeMessage().
@@ -127,19 +127,20 @@ static void cmsDecoderFinalize(
 	if(cmsDecoder->decoder != NULL) {
 		/*
 		 * Normally this gets freed in SecCmsDecoderFinish - this is
-		 * an error case.
-		 * FIXME: SecCmsDecoderDestroy() appears to destroy the
-		 * cmsMsg too! Plus there's a comment there re: a leak...
+		 * an error case. Unlike Finish, this calls SecCmsMessageDestroy.
 		 */
 		SecCmsDecoderDestroy(cmsDecoder->decoder);
+		cmsDecoder->cmsMsg = NULL;
 	}
 	CFRELEASE(cmsDecoder->detachedContent);
 	CFRELEASE(cmsDecoder->keychainOrArray);
 	if(cmsDecoder->cmsMsg != NULL) {
 		SecCmsMessageDestroy(cmsDecoder->cmsMsg);
+		cmsDecoder->cmsMsg = NULL;
 	}
 	if(cmsDecoder->arena != NULL) {
 		SecArenaPoolFree(cmsDecoder->arena, false);
+		cmsDecoder->arena = NULL;
 	}
 }
 
@@ -382,24 +383,14 @@ OSStatus CMSDecoderCopyDetachedContent(
 }
 
 /*
- * 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().
+ * Beginning in 10.12, this function stopped affecting the behavior of the
+ * CMS Decoder. Its only use was in SecTrustSetKeychains which is a no-op.
+ * Please discontinue use.
  */
 OSStatus CMSDecoderSetSearchKeychain(
                                      CMSDecoderRef		cmsDecoder,
                                      CFTypeRef			keychainOrArray)
 {
-	if(cmsDecoder == NULL) {
-		return errSecParam;
-	}
-	cmsDecoder->keychainOrArray = keychainOrArray;
-	if(keychainOrArray) {
-		CFRetain(keychainOrArray);
-	}
 	return errSecSuccess;
 }
 
@@ -473,11 +464,7 @@ OSStatus CMSDecoderCopySignerStatus(
 	SecTrustRef theTrust = NULL;
 	OSStatus vfyRtn = SecCmsSignedDataVerifySignerInfo(cmsDecoder->signedData,
                                                        (int)signerIndex,
-                                                       /*
-                                                        * FIXME this cast should not be necessary, but libsecurity_smime
-                                                        * declares this argument as a SecKeychainRef
-                                                        */
-                                                       (SecKeychainRef)cmsDecoder->keychainOrArray,
+                                                       NULL,
                                                        policyOrArray,
                                                        &theTrust);
 
@@ -537,10 +524,6 @@ OSStatus CMSDecoderCopySignerStatus(
 			case kSecTrustResultDeny:
 				tpVfyStatus = CSSMERR_APPLETP_TRUST_SETTING_DENY;
 				break;
-			case kSecTrustResultConfirm:
-				dprintf("SecTrustEvaluate reported confirm\n");
-				tpVfyStatus = CSSMERR_TP_NOT_TRUSTED;
-				break;
 			default:
 			{
 				/* get low-level TP error */