Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_manifest / lib / Download.cpp

diff --git a/OSX/libsecurity_manifest/lib/Download.cpp b/OSX/libsecurity_manifest/lib/Download.cpp
index 625ea5e63414fb62191ec9237c7129ffd27f2605..ce4a4efca679fca00f329564476afaff79dd84f5 100644 (file)
--- a/OSX/libsecurity_manifest/lib/Download.cpp
+++ b/OSX/libsecurity_manifest/lib/Download.cpp
@@ -109,7 +109,6 @@ void Download::GoOrNoGo (SecTrustResultType result)
                // we don't in this case, as the Apple signing root had better be
                // in X509 anchors.  I'm leaving this broken out for ease of use
                // in case we change our minds...
-               case kSecTrustResultConfirm:
                case kSecTrustResultRecoverableTrustFailure:
                case kSecTrustResultUnspecified:
                {
@@ -154,7 +153,7 @@ SecPolicyRef Download::GetPolicy ()
 void Download::ParseTicket (CFDataRef ticket)
 {
        // make a propertylist from the ticket
-       CFDictionaryRef mDict = (CFDictionaryRef) _SecureDownloadParseTicketXML (ticket);
+       CFRef<CFDictionaryRef> mDict = (CFDictionaryRef) _SecureDownloadParseTicketXML (ticket);
        CheckCFThingForNULL (mDict);
        CFRetain (mDict);
        
@@ -181,7 +180,7 @@ void Download::ParseTicket (CFDataRef ticket)
        
        // from the hashing dictionary, get the sector size
        number = (CFNumberRef) CFDictionaryGetValue (hashInfo, SD_XML_SECTOR_SIZE);
-       CFNumberGetValue (number, kCFNumberSInt32Type, &mSectorSize);
+       CFNumberGetValue (number, kCFNumberSInt64Type, &mSectorSize);
        
        // get the hashes
        mHashes = (CFDataRef) CFDictionaryGetValue (hashInfo, SD_XML_DIGESTS);