Title: [199306] tags/Safari-602.1.27.0.1/Source/WebKit2
- Revision
- 199306
- Author
- [email protected]
- Date
- 2016-04-11 12:37:01 -0700 (Mon, 11 Apr 2016)
Log Message
Merged r199301. rdar://problem/25628133
Modified Paths
Diff
Modified: tags/Safari-602.1.27.0.1/Source/WebKit2/ChangeLog (199305 => 199306)
--- tags/Safari-602.1.27.0.1/Source/WebKit2/ChangeLog 2016-04-11 19:33:05 UTC (rev 199305)
+++ tags/Safari-602.1.27.0.1/Source/WebKit2/ChangeLog 2016-04-11 19:37:01 UTC (rev 199306)
@@ -1,3 +1,20 @@
+2016-04-11 Babak Shafiei <[email protected]>
+
+ Merge r199301.
+
+ 2016-04-11 Daniel Bates <[email protected]>
+
+ REGRESSION (r198933): Unable to login to Google account from Internet Accounts preference pane
+ https://bugs.webkit.org/show_bug.cgi?id=156447
+ <rdar://problem/25628133>
+
+ Reviewed by Anders Carlsson.
+
+ Temporarily perform code signing verification only for Mac App Store- and Apple Developer- signed apps.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::codeSigningIdentifierForProcess):
+
2016-04-05 Youenn Fablet <[email protected]>
[Fetch API] Add a runtime flag to fetch API and related constructs
Modified: tags/Safari-602.1.27.0.1/Source/WebKit2/Shared/mac/ChildProcessMac.mm (199305 => 199306)
--- tags/Safari-602.1.27.0.1/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-11 19:33:05 UTC (rev 199305)
+++ tags/Safari-602.1.27.0.1/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-04-11 19:37:01 UTC (rev 199306)
@@ -90,13 +90,13 @@
RetainPtr<SecCodeRef> codePtr = adoptCF(code);
RELEASE_ASSERT(codePtr);
- CFStringRef appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement = CFSTR("(anchor apple) or (anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9]) or (anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13])");
+ CFStringRef macAppStoreSignedOrAppleDeveloperSignedRequirement = CFSTR("(anchor apple generic and certificate leaf[field.1.2.840.113635.100.6.1.9]) or (anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13])");
SecRequirementRef signingRequirement = nullptr;
- RELEASE_ASSERT(!SecRequirementCreateWithString(appleSignedOrMacAppStoreSignedOrAppleDeveloperSignedRequirement, kSecCSDefaultFlags, &signingRequirement));
+ RELEASE_ASSERT(!SecRequirementCreateWithString(macAppStoreSignedOrAppleDeveloperSignedRequirement, kSecCSDefaultFlags, &signingRequirement));
RetainPtr<SecRequirementRef> signingRequirementPtr = adoptCF(signingRequirement);
errorCode = SecCodeCheckValidity(codePtr.get(), kSecCSDefaultFlags, signingRequirementPtr.get());
if (errorCode == errSecCSUnsigned || errorCode == errSecCSReqFailed)
- return String(); // Unsigned or signed by a third-party
+ return String(); // Unsigned, signed by Apple, or signed by a third-party
if (errorCode != errSecSuccess)
return emptyString(); // e.g. invalid/malformed signature
String codeSigningIdentifier;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
