Changeset 252595 in webkit

Timestamp:

Nov 18, 2019 2:41:50 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Use SecTrustEvaluateWithError instead of SecTrustEvaluate where available
​https://bugs.webkit.org/show_bug.cgi?id=204159
Source/WebCore:

<rdar://problem/45894288>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-11-18
Reviewed by Darin Adler.

• platform/network/cocoa/ResourceResponseCocoa.mm:

(WebCore::ResourceResponse::platformCertificateInfo const):

Source/WebKit:

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-11-18
Reviewed by Darin Adler.

• UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

(-[WKFullScreenWindowController _EVOrganizationName]):

Source/WTF:

<rdar://problem/45894288>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-11-18
Reviewed by Darin Adler.

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-11-18  Alex Christensen  <achristensen@webkit.org>
+
+        Use SecTrustEvaluateWithError instead of SecTrustEvaluate where available
+        https://bugs.webkit.org/show_bug.cgi?id=204159
+        <rdar://problem/45894288>
+
+        Reviewed by Darin Adler.
+
+        * wtf/Platform.h:
+
 2019-11-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1622 +1622 @@
 #endif
 
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(WATCHOS) || PLATFORM(APPLETV) || PLATFORM(MACCATALYST)
+#define HAVE_SEC_TRUST_EVALUATE_WITH_ERROR 1
+#endif
+
 #if PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define USE_UICONTEXTMENU 1

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-18  Alex Christensen  <achristensen@webkit.org>
+
+        Use SecTrustEvaluateWithError instead of SecTrustEvaluate where available
+        https://bugs.webkit.org/show_bug.cgi?id=204159
+        <rdar://problem/45894288>
+
+        Reviewed by Darin Adler.
+
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        (WebCore::ResourceResponse::platformCertificateInfo const):
+
 2019-11-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

@@ -97 +97 @@
 
     if (trustResultType == kSecTrustResultInvalid) {
-        // FIXME: This is deprecated <rdar://problem/45894288>.
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+#if HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
+        if (!SecTrustEvaluateWithError(trust, nullptr))
+            return { };
+#else
         result = SecTrustEvaluate(trust, &trustResultType);
-        ALLOW_DEPRECATED_DECLARATIONS_END
         if (result != errSecSuccess)
             return { };
+#endif
     }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-18  Alex Christensen  <achristensen@webkit.org>
+
+        Use SecTrustEvaluateWithError instead of SecTrustEvaluate where available
+        https://bugs.webkit.org/show_bug.cgi?id=204159
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+        (-[WKFullScreenWindowController _EVOrganizationName]):
+
 2019-11-18  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

@@ -930 +930 @@
         return nil;
 
-    NSDictionary *infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
+    NSDictionary *infoDictionary = CFBridgingRelease(SecTrustCopyInfo(trust));
     // If SecTrustCopyInfo returned NULL then it's likely that the SecTrustRef has not been evaluated
     // and the only way to get the information we need is to call SecTrustEvaluate ourselves.
     if (!infoDictionary) {
+#if HAVE(SEC_TRUST_EVALUATE_WITH_ERROR)
+        if (!SecTrustEvaluateWithError(trust, nullptr))
+            return nil;
+#else
         SecTrustResultType result = kSecTrustResultProceed;
-
-        // FIXME: This is deprecated <rdar://problem/45894288>.
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
         OSStatus err = SecTrustEvaluate(trust, &result);
-        ALLOW_DEPRECATED_DECLARATIONS_END
-
-        if (err == noErr)
-            infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
+        if (err != noErr)
+            return nil;
+#endif
+        infoDictionary = CFBridgingRelease(SecTrustCopyInfo(trust));
         if (!infoDictionary)
             return nil;