Changeset 288310 in webkit

Timestamp:

Jan 20, 2022, 11:12:51 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[ iOS15 ] TestWebKitAPI.WebKit.ServerTrust and TestWebKitAPI.WebKit.FastServerTrust tests timing out
​https://bugs.webkit.org/show_bug.cgi?id=231320
<rdar://80352256>

Patch by Alex Christensen <​achristensen@webkit.org> on 2022-01-20
Reviewed by Chris Dumez.

SecTrustCopyCertificateChain returns a CFArrayRef of SecCertificateRef, not CFData.

• TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:

(verifyCertificateAndPublicKey):
(TestWebKitAPI::TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2022-01-20  Alex Christensen  <achristensen@webkit.org>
+
+        [ iOS15 ] TestWebKitAPI.WebKit.ServerTrust and TestWebKitAPI.WebKit.FastServerTrust tests timing out
+        https://bugs.webkit.org/show_bug.cgi?id=231320
+        <rdar://80352256>
+
+        Reviewed by Chris Dumez.
+
+        SecTrustCopyCertificateChain returns a CFArrayRef of SecCertificateRef, not CFData.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+        (verifyCertificateAndPublicKey):
+        (TestWebKitAPI::TEST):
+
 2022-01-20  Angelos Oikonomopoulos  <angelos@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm

@@ -453 +453 @@
 
 #if HAVE(SEC_TRUST_COPY_CERTIFICATE_CHAIN)
-    auto certificate = adoptCF((CFDataRef)CFArrayGetValueAtIndex(adoptCF(SecTrustCopyCertificateChain(trust)).get(), 0));
+    auto certificate = adoptCF(SecCertificateCopyData((SecCertificateRef)CFArrayGetValueAtIndex(adoptCF(SecTrustCopyCertificateChain(trust)).get(), 0)));
 #else
     auto certificate = adoptCF(SecCertificateCopyData(SecTrustGetCertificateAtIndex(trust, 0)));
@@ -601 +601 @@
 namespace TestWebKitAPI {
 
-// FIXME: Re-enable these tests once webkit.org/b/231320 is resolved.
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
 TEST(WebKit, ServerTrust)
 {
@@ -632 +630 @@
     EXPECT_EQ([delegate authenticationChallengeCount], 1ull);
 }
-#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
 
 TEST(WebKit, ErrorSecureCoding)