<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280259] branches/safari-612.1.25-branch/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280259">280259</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-07-23 14:43:37 -0700 (Fri, 23 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert "Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280205">r280205</a>. rdar://problem/80991517"

This reverts commit <a href="http://trac.webkit.org/projects/webkit/changeset/280209">r280209</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612125branchSourceWTFChangeLog">branches/safari-612.1.25-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari612125branchSourceWTFWTFxcodeprojprojectpbxproj">branches/safari-612.1.25-branch/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari612125branchSourceWTFwtfspicocoaSecuritySPIh">branches/safari-612.1.25-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h</a></li>
<li><a href="#branchessafari612125branchSourceWebKitChangeLog">branches/safari-612.1.25-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612125branchSourceWebKitSharedCocoaXPCEndpointmm">branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/XPCEndpoint.mm</a></li>
<li><a href="#branchessafari612125branchSourceWebKitSourcesCocoatxt">branches/safari-612.1.25-branch/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#branchessafari612125branchSourceWebKitUIProcessCocoaWebProcessProxyCocoamm">branches/safari-612.1.25-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
<li><a href="#branchessafari612125branchSourceWebKitUIProcessWebProcessProxycpp">branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#branchessafari612125branchSourceWebKitUIProcessWebProcessProxyh">branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#branchessafari612125branchSourceWebKitUIProcessmacWebProcessProxyMacmm">branches/safari-612.1.25-branch/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm</a></li>
<li><a href="#branchessafari612125branchSourceWebKitWebKitxcodeprojprojectpbxproj">branches/safari-612.1.25-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612125branchSourceWebKitSharedmacCodeSigningh">branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.h</a></li>
<li><a href="#branchessafari612125branchSourceWebKitSharedmacCodeSigningmm">branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.mm</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari612125branchSourceWTFwtfspidarwinCodeSignSPIh">branches/safari-612.1.25-branch/Source/WTF/wtf/spi/darwin/CodeSignSPI.h</a></li>
<li><a href="#branchessafari612125branchSourceWebKitSharedCocoaCodeSigningh">branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.h</a></li>
<li><a href="#branchessafari612125branchSourceWebKitSharedCocoaCodeSigningmm">branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612125branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WTF/ChangeLog (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WTF/ChangeLog     2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WTF/ChangeLog        2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,59 +1,3 @@
</span><del>-2021-07-22  Alan Coon  <alancoon@apple.com>
-
-        Cherry-pick r280205. rdar://problem/80991517
-
-    REGRESSION (r278877) [Cocoa] WebAuthn stopped working for non-Safari browsers
-    https://bugs.webkit.org/show_bug.cgi?id=228116
-    <rdar://problem/80693607>
-    
-    Reviewed by Per Arne Vollan.
-    
-    Source/WebKit:
-    
-    We should not be using the PAC key to confirm a valid WebContent process is the source of
-    WebAuthn-related messages. Instead, we should confirm the message source is an Apple-signed
-    executable, and that the signining identity is for the WebContent process.
-    
-    * Shared/Cocoa/CodeSigning.h: Renamed from Source/WebKit/Shared/mac/CodeSigning.h.
-    * Shared/Cocoa/CodeSigning.mm: Renamed from Source/WebKit/Shared/mac/CodeSigning.mm.
-    (WebKit::codeSigningIdentifier):
-    (WebKit::codeSigningIdentifierForCurrentProcess):
-    (WebKit::codeSigningIdentifierAndPlatformBinaryStatus): Added.
-    * Shared/Cocoa/XPCEndpoint.mm:
-    (WebKit::XPCEndpoint::XPCEndpoint): Update to use new method.
-    * SourcesCocoa.txt:
-    * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
-    (WebKit::WebProcessProxy::messageSourceIsValidWebContentProcess):
-    * UIProcess/WebProcessProxy.cpp:
-    (WebKit:WebProcessProxy::getWebAuthnProcessConnection): Update for new message check name.
-    * UIProcess/WebProcessProxy.h:
-    * WebKit.xcodeproj/project.pbxproj:
-    
-    Source/WTF:
-    
-    Add new SPI header for code signing features.
-    
-    * WTF.xcodeproj/project.pbxproj:
-    * wtf/spi/cocoa/SecuritySPI.h: Move some SecTask calls out of PLATFORM(MAC).
-    * wtf/spi/darwin/CodeSignSPI.h: Added.
-    
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280205 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-07-22  Brent Fulgham  <bfulgham@apple.com>
-
-            REGRESSION (r278877) [Cocoa] WebAuthn stopped working for non-Safari browsers
-            https://bugs.webkit.org/show_bug.cgi?id=228116
-            <rdar://problem/80693607>
-
-            Reviewed by Per Arne Vollan.
-
-            Add new SPI header for code signing features.
-
-            * WTF.xcodeproj/project.pbxproj:
-            * wtf/spi/cocoa/SecuritySPI.h: Move some SecTask calls out of PLATFORM(MAC).
-            * wtf/spi/darwin/CodeSignSPI.h: Added.
-
</del><span class="cx"> 2021-07-21  Miguel Gomez  <magomez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] Allow the user to configure the MemoryPressureHandler inside the web process
</span></span></pre></div>
<a id="branchessafari612125branchSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WTF/WTF.xcodeproj/project.pbxproj (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WTF/WTF.xcodeproj/project.pbxproj    2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -451,7 +451,6 @@
</span><span class="cx">          795212021F42588800BD6421 /* SingleRootGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleRootGraph.h; sourceTree = "<group>"; };
</span><span class="cx">          7A05093D1FB9DCC500B33FB8 /* JSONValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONValues.h; sourceTree = "<group>"; };
</span><span class="cx">          7A05093E1FB9DCC500B33FB8 /* JSONValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONValues.cpp; sourceTree = "<group>"; };
</span><del>-               7A4D4AAB26A8DEFC001182F1 /* CodeSignSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CodeSignSPI.h; sourceTree = "<group>"; };
</del><span class="cx">           7A6EBA3220746C33004F9C44 /* MachSendRight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachSendRight.h; sourceTree = "<group>"; };
</span><span class="cx">          7A6EBA3320746C34004F9C44 /* MachSendRight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MachSendRight.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7AF023B32061E16C00A8EFD6 /* ProcessPrivilege.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessPrivilege.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -1521,7 +1520,6 @@
</span><span class="cx">          CE73E02319DCB7AB00580D5C /* darwin */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><del>-                               7A4D4AAB26A8DEFC001182F1 /* CodeSignSPI.h */,
</del><span class="cx">                           14933E21228C22DF00F79E46 /* DataVaultSPI.h */,
</span><span class="cx">                          E431CC4A21187ADB000C8A07 /* DispatchSPI.h */,
</span><span class="cx">                          93DDE9311CDC052D00FD3491 /* dyldSPI.h */,
</span></span></pre></div>
<a id="branchessafari612125branchSourceWTFwtfspicocoaSecuritySPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h   2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h      2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2021 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -76,9 +76,7 @@
</span><span class="cx"> 
</span><span class="cx"> SecTaskRef SecTaskCreateWithAuditToken(CFAllocatorRef, audit_token_t);
</span><span class="cx"> SecTaskRef SecTaskCreateFromSelf(CFAllocatorRef);
</span><del>-CFStringRef SecTaskCopySigningIdentifier(SecTaskRef, CFErrorRef *);
</del><span class="cx"> CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef*);
</span><del>-uint32_t SecTaskGetCodeSignStatus(SecTaskRef);
</del><span class="cx"> SecIdentityRef SecIdentityCreate(CFAllocatorRef, SecCertificateRef, SecKeyRef);
</span><span class="cx"> SecAccessControlRef SecAccessControlCreateFromData(CFAllocatorRef, CFDataRef, CFErrorRef*);
</span><span class="cx"> CFDataRef SecAccessControlCopyData(SecAccessControlRef);
</span><span class="lines">@@ -87,10 +85,12 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include <Security/SecAsn1Types.h>
</span><ins>+CFStringRef SecTaskCopySigningIdentifier(SecTaskRef, CFErrorRef *);
</ins><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_BEGIN
</span><span class="cx"> extern const SecAsn1Template kSecAsn1AlgorithmIDTemplate[];
</span><span class="cx"> extern const SecAsn1Template kSecAsn1SubjectPublicKeyInfoTemplate[];
</span><span class="cx"> ALLOW_DEPRECATED_DECLARATIONS_END
</span><ins>+uint32_t SecTaskGetCodeSignStatus(SecTaskRef);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(SEC_TRUST_SERIALIZATION)
</span></span></pre></div>
<a id="branchessafari612125branchSourceWTFwtfspidarwinCodeSignSPIh"></a>
<div class="delfile"><h4>Deleted: branches/safari-612.1.25-branch/Source/WTF/wtf/spi/darwin/CodeSignSPI.h (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WTF/wtf/spi/darwin/CodeSignSPI.h  2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WTF/wtf/spi/darwin/CodeSignSPI.h     2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#pragma once
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#include <Kernel/kern/cs_blobs.h>
-
-#else
-
-#define CS_PLATFORM_BINARY          0x04000000
-
-#endif
</del></span></pre></div>
<a id="branchessafari612125branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/ChangeLog (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/ChangeLog  2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/ChangeLog     2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -47,75 +47,6 @@
</span><span class="cx">             It is unnecessary to use autorelease; instead just store the contents
</span><span class="cx">             object in a RetainPtr until it is set.
</span><span class="cx"> 
</span><del>-2021-07-22  Alan Coon  <alancoon@apple.com>
-
-        Cherry-pick r280205. rdar://problem/80991517
-
-    REGRESSION (r278877) [Cocoa] WebAuthn stopped working for non-Safari browsers
-    https://bugs.webkit.org/show_bug.cgi?id=228116
-    <rdar://problem/80693607>
-    
-    Reviewed by Per Arne Vollan.
-    
-    Source/WebKit:
-    
-    We should not be using the PAC key to confirm a valid WebContent process is the source of
-    WebAuthn-related messages. Instead, we should confirm the message source is an Apple-signed
-    executable, and that the signining identity is for the WebContent process.
-    
-    * Shared/Cocoa/CodeSigning.h: Renamed from Source/WebKit/Shared/mac/CodeSigning.h.
-    * Shared/Cocoa/CodeSigning.mm: Renamed from Source/WebKit/Shared/mac/CodeSigning.mm.
-    (WebKit::codeSigningIdentifier):
-    (WebKit::codeSigningIdentifierForCurrentProcess):
-    (WebKit::codeSigningIdentifierAndPlatformBinaryStatus): Added.
-    * Shared/Cocoa/XPCEndpoint.mm:
-    (WebKit::XPCEndpoint::XPCEndpoint): Update to use new method.
-    * SourcesCocoa.txt:
-    * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
-    (WebKit::WebProcessProxy::messageSourceIsValidWebContentProcess):
-    * UIProcess/WebProcessProxy.cpp:
-    (WebKit:WebProcessProxy::getWebAuthnProcessConnection): Update for new message check name.
-    * UIProcess/WebProcessProxy.h:
-    * WebKit.xcodeproj/project.pbxproj:
-    
-    Source/WTF:
-    
-    Add new SPI header for code signing features.
-    
-    * WTF.xcodeproj/project.pbxproj:
-    * wtf/spi/cocoa/SecuritySPI.h: Move some SecTask calls out of PLATFORM(MAC).
-    * wtf/spi/darwin/CodeSignSPI.h: Added.
-    
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280205 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-07-22  Brent Fulgham  <bfulgham@apple.com>
-
-            REGRESSION (r278877) [Cocoa] WebAuthn stopped working for non-Safari browsers
-            https://bugs.webkit.org/show_bug.cgi?id=228116
-            <rdar://problem/80693607>
-
-            Reviewed by Per Arne Vollan.
-
-            We should not be using the PAC key to confirm a valid WebContent process is the source of
-            WebAuthn-related messages. Instead, we should confirm the message source is an Apple-signed
-            executable, and that the signining identity is for the WebContent process.
-
-            * Shared/Cocoa/CodeSigning.h: Renamed from Source/WebKit/Shared/mac/CodeSigning.h.
-            * Shared/Cocoa/CodeSigning.mm: Renamed from Source/WebKit/Shared/mac/CodeSigning.mm.
-            (WebKit::codeSigningIdentifier):
-            (WebKit::codeSigningIdentifierForCurrentProcess):
-            (WebKit::codeSigningIdentifierAndPlatformBinaryStatus): Added.
-            * Shared/Cocoa/XPCEndpoint.mm:
-            (WebKit::XPCEndpoint::XPCEndpoint): Update to use new method.
-            * SourcesCocoa.txt:
-            * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
-            (WebKit::WebProcessProxy::messageSourceIsValidWebContentProcess):
-            * UIProcess/WebProcessProxy.cpp:
-            (WebKit:WebProcessProxy::getWebAuthnProcessConnection): Update for new message check name.
-            * UIProcess/WebProcessProxy.h:
-            * WebKit.xcodeproj/project.pbxproj:
-
</del><span class="cx"> 2021-07-21  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         RunningBoard kills the network process if it is still holding the "holding locked file" assertion upon suspension
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSharedCocoaCodeSigningh"></a>
<div class="delfile"><h4>Deleted: branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.h (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.h 2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.h    2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/Forward.h>
-#include <wtf/spi/darwin/XPCSPI.h>
-
-namespace WebKit {
-
-// These functions return a null string if the process is unsigned.
-String codeSigningIdentifierForCurrentProcess();
-String codeSigningIdentifier(xpc_connection_t);
-bool currentProcessIsPlatformBinary();
-std::pair<String, bool> codeSigningIdentifierAndPlatformBinaryStatus(xpc_connection_t);
-
-} // namespace WebKit
</del></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSharedCocoaCodeSigningmm"></a>
<div class="delfile"><h4>Deleted: branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.mm (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.mm        2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.mm   2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "CodeSigning.h"
-
-#if PLATFORM(COCOA)
-
-#import <wtf/RetainPtr.h>
-#import <wtf/spi/cocoa/SecuritySPI.h>
-#import <wtf/spi/darwin/CodeSignSPI.h>
-#import <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-static String codeSigningIdentifier(SecTaskRef task)
-{
-    return adoptCF(SecTaskCopySigningIdentifier(task, nullptr)).get();
-}
-
-String codeSigningIdentifierForCurrentProcess()
-{
-    return codeSigningIdentifier(adoptCF(SecTaskCreateFromSelf(kCFAllocatorDefault)).get());
-}
-
-String codeSigningIdentifier(xpc_connection_t connection)
-{
-    auto pair = codeSigningIdentifierAndPlatformBinaryStatus(connection);
-    return pair.first;
-}
-
-bool currentProcessIsPlatformBinary()
-{
-    auto task = adoptCF(SecTaskCreateFromSelf(kCFAllocatorDefault));
-    return SecTaskGetCodeSignStatus(task.get()) & CS_PLATFORM_BINARY;
-}
-
-std::pair<String, bool> codeSigningIdentifierAndPlatformBinaryStatus(xpc_connection_t connection)
-{
-    audit_token_t auditToken;
-    xpc_connection_get_audit_token(connection, &auditToken);
-    auto task = adoptCF(SecTaskCreateWithAuditToken(kCFAllocatorDefault, auditToken));
-    bool isPlatformBinary = SecTaskGetCodeSignStatus(task.get()) & CS_PLATFORM_BINARY;
-    auto signingIdentifier = codeSigningIdentifier(task.get());
-    return std::make_pair(signingIdentifier, isPlatformBinary);
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(COCOA)
</del></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSharedCocoaXPCEndpointmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/XPCEndpoint.mm (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/XPCEndpoint.mm        2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/XPCEndpoint.mm   2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2020 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,7 +30,9 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #import "CodeSigning.h"
</span><ins>+#import <Kernel/kern/cs_blobs.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/spi/cocoa/SecuritySPI.h>
</ins><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -53,7 +55,10 @@
</span><span class="cx">             if (pid != getpid() && !WTF::hasEntitlement(connection.get(), "com.apple.private.webkit.use-xpc-endpoint")) {
</span><span class="cx">                 WTFLogAlways("Audit token does not have required entitlement com.apple.private.webkit.use-xpc-endpoint");
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-                auto [signingIdentifier, isPlatformBinary] = codeSigningIdentifierAndPlatformBinaryStatus(connection.get());
</del><ins>+                audit_token_t auditToken;
+                xpc_connection_get_audit_token(connection.get(), &auditToken);
+                bool isPlatformBinary = SecTaskGetCodeSignStatus(adoptCF(SecTaskCreateWithAuditToken(kCFAllocatorDefault, auditToken)).get()) & CS_PLATFORM_BINARY;
+                auto signingIdentifier = codeSigningIdentifier(connection.get());
</ins><span class="cx"> 
</span><span class="cx">                 if (!isPlatformBinary || !signingIdentifier.startsWith("com.apple.WebKit.WebContent")) {
</span><span class="cx">                     WTFLogAlways("XPC endpoint denied to connect with unknown client");
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSharedmacCodeSigninghfromrev280249branchessafari612125branchSourceWebKitSharedCocoaCodeSigningh"></a>
<div class="copfile"><h4>Copied: branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.h (from rev 280249, branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.h) (0 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.h                           (rev 0)
+++ branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.h      2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/Forward.h>
+#include <wtf/spi/darwin/XPCSPI.h>
+
+namespace WebKit {
+
+// These functions return a null string if the process is unsigned.
+String codeSigningIdentifierForCurrentProcess();
+String codeSigningIdentifier(xpc_connection_t);
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSharedmacCodeSigningmmfromrev280249branchessafari612125branchSourceWebKitSharedCocoaCodeSigningmm"></a>
<div class="copfile"><h4>Copied: branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.mm (from rev 280249, branches/safari-612.1.25-branch/Source/WebKit/Shared/Cocoa/CodeSigning.mm) (0 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.mm                          (rev 0)
+++ branches/safari-612.1.25-branch/Source/WebKit/Shared/mac/CodeSigning.mm     2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "CodeSigning.h"
+
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
+
+#import <wtf/RetainPtr.h>
+#import <wtf/spi/cocoa/SecuritySPI.h>
+#import <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+static String codeSigningIdentifier(SecTaskRef task)
+{
+    return adoptCF(SecTaskCopySigningIdentifier(task, nullptr)).get();
+}
+
+String codeSigningIdentifierForCurrentProcess()
+{
+    return codeSigningIdentifier(adoptCF(SecTaskCreateFromSelf(kCFAllocatorDefault)).get());
+}
+
+String codeSigningIdentifier(xpc_connection_t connection)
+{
+    audit_token_t auditToken;
+    xpc_connection_get_audit_token(connection, &auditToken);
+    return codeSigningIdentifier(adoptCF(SecTaskCreateWithAuditToken(kCFAllocatorDefault, auditToken)).get());
+}
+
+} // namespace WebKit
+
+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="branchessafari612125branchSourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/SourcesCocoa.txt (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/SourcesCocoa.txt   2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/SourcesCocoa.txt      2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright (C) 2018-2021 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2018-2019 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions
</span><span class="lines">@@ -161,7 +161,6 @@
</span><span class="cx"> Shared/Cocoa/APIObject.mm
</span><span class="cx"> Shared/Cocoa/ArgumentCodersCocoa.mm
</span><span class="cx"> Shared/Cocoa/AuxiliaryProcessCocoa.mm
</span><del>-Shared/Cocoa/CodeSigning.mm
</del><span class="cx"> Shared/Cocoa/CompletionHandlerCallChecker.mm
</span><span class="cx"> Shared/Cocoa/CoreTextHelpers.mm
</span><span class="cx"> Shared/Cocoa/DataDetectionResult.mm
</span><span class="lines">@@ -206,6 +205,7 @@
</span><span class="cx"> Shared/ios/WebTouchEventIOS.cpp
</span><span class="cx"> 
</span><span class="cx"> Shared/mac/AuxiliaryProcessMac.mm
</span><ins>+Shared/mac/CodeSigning.mm
</ins><span class="cx"> Shared/mac/HangDetectionDisablerMac.mm
</span><span class="cx"> Shared/mac/NativeWebGestureEventMac.mm
</span><span class="cx"> Shared/mac/NativeWebKeyboardEventMac.mm
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitUIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm    2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm       2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> 
</span><span class="cx"> #import "AccessibilitySupportSPI.h"
</span><del>-#import "CodeSigning.h"
</del><span class="cx"> #import "HighPerformanceGPUManager.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "ObjCObjectGraph.h"
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WebProcessProxy::messageSourceIsValidWebContentProcess()
</del><ins>+bool WebProcessProxy::hasCorrectPACEntitlement()
</ins><span class="cx"> {
</span><span class="cx">     if (!hasConnection()) {
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="lines">@@ -313,21 +312,22 @@
</span><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if HAVE(PAC_SHARED_REGION_ID)
+    auto auditToken = connection()->getAuditToken();
+    if (!auditToken) {
+        ASSERT_NOT_REACHED();
+        RELEASE_LOG_ERROR(Process, "Unable to get parent web process audit token");
+        return false;
+    }
+
</ins><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><del>-#if PLATFORM(IOS)
-    // FIXME(rdar://80908833): On iOS, we can only perform the below checks for platform binaries until rdar://80908833 is fixed.
-    if (!currentProcessIsPlatformBinary())
-        return true;
-#endif
-
</del><span class="cx">     // Confirm that the connection is from a WebContent process:
</span><del>-    auto [signingIdentifier, isPlatformBinary] = codeSigningIdentifierAndPlatformBinaryStatus(connection()->xpcConnection());
-
-    if (!isPlatformBinary || !signingIdentifier.startsWith("com.apple.WebKit.WebContent")) {
-        RELEASE_LOG_ERROR(Process, "Process is not an entitled WebContent process.");
</del><ins>+    if (!WTF::hasEntitlementValue(auditToken.value(), "com.apple.pac.shared_region_id", "WebContent")) {
+        RELEASE_LOG_ERROR(Process, "Process is not an entitled WebContent process. Process shared_region_id is incorrect.");
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitUIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp      2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx"> #if ENABLE(WEB_AUTHN)
</span><span class="cx"> void WebProcessProxy::getWebAuthnProcessConnection(Messages::WebProcessProxy::GetWebAuthnProcessConnection::DelayedReply&& reply)
</span><span class="cx"> {
</span><del>-    MESSAGE_CHECK_COMPLETION(messageSourceIsValidWebContentProcess(), reply({ }));
</del><ins>+    MESSAGE_CHECK_COMPLETION(hasCorrectPACEntitlement(), reply({ }));
</ins><span class="cx">     m_processPool->getWebAuthnProcessConnection(*this, WTFMove(reply));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitUIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.h (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.h        2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/UIProcess/WebProcessProxy.h   2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    bool messageSourceIsValidWebContentProcess();
</del><ins>+    bool hasCorrectPACEntitlement();
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     enum class IsWeak { No, Yes };
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitUIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm        2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm   2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011-2021 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,10 +29,11 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> 
</span><del>-#import "CodeSigning.h"
</del><span class="cx"> #import "WKFullKeyboardAccessWatcher.h"
</span><ins>+#import <Kernel/kern/cs_blobs.h>
</ins><span class="cx"> #import <signal.h>
</span><span class="cx"> #import <wtf/ProcessPrivilege.h>
</span><ins>+#import <wtf/spi/cocoa/SecuritySPI.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx">     if (!isSystemWebKit)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    static bool isPlatformBinary = currentProcessIsPlatformBinary();
</del><ins>+    static bool isPlatformBinary = SecTaskGetCodeSignStatus(adoptCF(SecTaskCreateFromSelf(kCFAllocatorDefault)).get()) & CS_PLATFORM_BINARY;
</ins><span class="cx">     if (isPlatformBinary)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612125branchSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.25-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (280258 => 280259)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.25-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj   2021-07-23 21:01:12 UTC (rev 280258)
+++ branches/safari-612.1.25-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj      2021-07-23 21:43:37 UTC (rev 280259)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">  archiveVersion = 1;
</span><span class="cx">  classes = {
</span><span class="cx">  };
</span><del>-       objectVersion = 54;
</del><ins>+        objectVersion = 52;
</ins><span class="cx">   objects = {
</span><span class="cx"> 
</span><span class="cx"> /* Begin PBXAggregateTarget section */
</span><span class="lines">@@ -5998,6 +5998,7 @@
</span><span class="cx">          F40BBB40257FF46E0067463A /* GPUProcessWakeupMessageArguments.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPUProcessWakeupMessageArguments.h; sourceTree = "<group>"; };
</span><span class="cx">          F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = "<group>"; };
</span><span class="cx">          F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = "<group>"; };
</span><ins>+               F414CE2A269DDED100BD216A /* GPUProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = GPUProcessCocoa.mm; path = cocoa/GPUProcessCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx">           F414CE2C269DE6EA00BD216A /* RemoteRenderingBackendState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRenderingBackendState.h; sourceTree = "<group>"; };
</span><span class="cx">          F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionData.h; path = ios/WebAutocorrectionData.h; sourceTree = "<group>"; };
</span><span class="cx">          F42D634022A0EFD300D2FB3A /* WebAutocorrectionData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebAutocorrectionData.mm; path = ios/WebAutocorrectionData.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -8356,8 +8357,6 @@
</span><span class="cx">                          A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */,
</span><span class="cx">                          A175C44B21AA331B000037D0 /* ArgumentCodersCocoa.mm */,
</span><span class="cx">                          1A698F171E4910220064E881 /* AuxiliaryProcessCocoa.mm */,
</span><del>-                               CE11AD511CBC482F00681EE5 /* CodeSigning.h */,
-                               CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */,
</del><span class="cx">                           37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */,
</span><span class="cx">                          37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */,
</span><span class="cx">                          1C739E872347BD0F00C621EC /* CoreTextHelpers.h */,
</span><span class="lines">@@ -10531,6 +10530,8 @@
</span><span class="cx">                  children = (
</span><span class="cx">                          A15799AC2584433100528236 /* MediaFormatReader */,
</span><span class="cx">                          9F54F88E16488E87007DF81A /* AuxiliaryProcessMac.mm */,
</span><ins>+                               CE11AD511CBC482F00681EE5 /* CodeSigning.h */,
+                               CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */,
</ins><span class="cx">                           1AC75A1C1B33695E0056745B /* HangDetectionDisablerMac.mm */,
</span><span class="cx">                          2D50365D1BCC793F00E20BB3 /* NativeWebGestureEventMac.mm */,
</span><span class="cx">                          C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
</span><span class="lines">@@ -11711,6 +11712,14 @@
</span><span class="cx">                  path = cache;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="cx">          };
</span><ins>+               F414CE27269DDE8000BD216A /* cocoa */ = {
+                       isa = PBXGroup;
+                       children = (
+                               F414CE2A269DDED100BD216A /* GPUProcessCocoa.mm */,
+                       );
+                       name = cocoa;
+                       sourceTree = "<group>";
+               };
</ins><span class="cx">           F638955A133BF57D008941D5 /* mac */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span></span></pre>
</div>
</div>

</body>
</html>