Title: [290911] branches/safari-613-branch/Tools
- Revision
- 290911
- Author
- [email protected]
- Date
- 2022-03-07 14:08:39 -0800 (Mon, 07 Mar 2022)
Log Message
Cherry-pick r288310. rdar://problem/80352256
[ 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 <[email protected]> on 2022-01-20
Reviewed by Chris Dumez.
SecTrustCopyCertificateChain returns a CFArrayRef of SecCertificateRef, not CFData.
* TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
(verifyCertificateAndPublicKey):
(TestWebKitAPI::TEST):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Tools/ChangeLog (290910 => 290911)
--- branches/safari-613-branch/Tools/ChangeLog 2022-03-07 22:08:37 UTC (rev 290910)
+++ branches/safari-613-branch/Tools/ChangeLog 2022-03-07 22:08:39 UTC (rev 290911)
@@ -1,3 +1,36 @@
+2022-03-07 Russell Epstein <[email protected]>
+
+ Cherry-pick r288310. rdar://problem/80352256
+
+ [ 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 <[email protected]> on 2022-01-20
+ Reviewed by Chris Dumez.
+
+ SecTrustCopyCertificateChain returns a CFArrayRef of SecCertificateRef, not CFData.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+ (verifyCertificateAndPublicKey):
+ (TestWebKitAPI::TEST):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-20 Alex Christensen <[email protected]>
+
+ [ 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-03-01 Russell Epstein <[email protected]>
Revert r289282. rdar://problem/88876661
Modified: branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (290910 => 290911)
--- branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2022-03-07 22:08:37 UTC (rev 290910)
+++ branches/safari-613-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2022-03-07 22:08:39 UTC (rev 290911)
@@ -452,7 +452,7 @@
EXPECT_EQ(1, SecTrustGetCertificateCount(trust));
#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)));
#endif
@@ -600,8 +600,6 @@
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)
{
HTTPServer server(HTTPServer::respondWithOK, HTTPServer::Protocol::Https);
@@ -631,7 +629,6 @@
[delegate waitForDidFinishNavigation];
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)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
