Skip to content

Commit

Permalink
Unreviewed, reverting 276590@main.
Browse files Browse the repository at this point in the history
  • Loading branch information
webkit-commit-queue authored and cdumez committed Mar 24, 2024
1 parent 851d99c commit 76e01e6
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 45 deletions.
10 changes: 0 additions & 10 deletions Source/JavaScriptCore/Scripts/process-entitlements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ function plistbuddy()
function mac_process_jsc_entitlements()
{
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
Expand All @@ -32,8 +30,6 @@ function mac_process_jsc_entitlements()

function mac_process_testapi_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
Expand All @@ -60,8 +56,6 @@ function mac_process_testapi_entitlements()
function maccatalyst_process_jsc_entitlements()
{
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
Expand All @@ -83,8 +77,6 @@ function maccatalyst_process_testapi_entitlements()
{
plistbuddy Add :com.apple.rootless.storage.JavaScriptCore bool YES
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
then
Expand All @@ -108,8 +100,6 @@ function ios_family_process_jsc_entitlements()
plistbuddy Add :com.apple.private.verified-jit bool YES
plistbuddy Add :dynamic-codesigning bool YES
plistbuddy Add :com.apple.developer.kernel.extended-virtual-addressing bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
}

function ios_family_process_testapi_entitlements()
Expand Down
4 changes: 0 additions & 4 deletions Source/JavaScriptCore/entitlements.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@
<true/>
<key>dynamic-codesigning</key>
<true/>
<key>com.apple.security.fatal-exceptions</key>
<array>
<string>jit</string>
</array>
</dict>
</plist>
27 changes: 0 additions & 27 deletions Source/WebKit/Scripts/process-entitlements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ function plistbuddy()
function mac_process_webcontent_entitlements()
{
plistbuddy Add :com.apple.security.cs.allow-jit bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
Expand Down Expand Up @@ -42,8 +40,6 @@ function mac_process_webcontent_entitlements()

function mac_process_webcontent_captiveportal_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES
Expand Down Expand Up @@ -77,8 +73,6 @@ function mac_process_webcontent_captiveportal_entitlements()

function mac_process_gpu_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 101400 ))
Expand Down Expand Up @@ -133,8 +127,6 @@ function mac_process_gpu_entitlements()

function mac_process_network_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]]
then
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 101500 ))
Expand Down Expand Up @@ -249,8 +241,6 @@ function maccatalyst_process_webcontent_entitlements()
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES
plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
then
Expand Down Expand Up @@ -289,9 +279,6 @@ function maccatalyst_process_webcontent_captiveportal_entitlements()
plistbuddy Add :com.apple.imageio.allowabletypes:2 string public.png
plistbuddy Add :com.apple.imageio.allowabletypes:3 string com.compuserve.gif

plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 ))
then
plistbuddy Add :com.apple.developer.kernel.extended-virtual-addressing bool YES
Expand Down Expand Up @@ -319,8 +306,6 @@ function maccatalyst_process_webcontent_captiveportal_entitlements()

function maccatalyst_process_gpu_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
plistbuddy Add :com.apple.security.network.client bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES
Expand All @@ -341,8 +326,6 @@ function maccatalyst_process_gpu_entitlements()

function maccatalyst_process_network_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit
plistbuddy Add :com.apple.private.network.socket-delegate bool YES
plistbuddy Add :com.apple.security.network.client bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
Expand Down Expand Up @@ -384,10 +367,6 @@ function ios_family_process_webcontent_shared_entitlements()
plistbuddy Add :com.apple.private.webinspector.proxy-application bool YES
plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES
plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES

plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

if [[ "${PRODUCT_NAME}" != WebContentExtension && "${PRODUCT_NAME}" != WebContentCaptivePortalExtension ]]; then
plistbuddy Add :com.apple.private.gpu-restricted bool YES
plistbuddy Add :com.apple.private.pac.exception bool YES
Expand Down Expand Up @@ -427,9 +406,6 @@ function ios_family_process_webcontent_captiveportal_entitlements()

function ios_family_process_gpu_entitlements()
{
plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

plistbuddy Add :com.apple.QuartzCore.secure-mode bool YES
plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES
plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES
Expand Down Expand Up @@ -519,9 +495,6 @@ function ios_family_process_network_entitlements()
plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token:0 string kTCCServiceWebKitIntelligentTrackingPrevention
plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token:1 string kTCCServiceUserTracking

plistbuddy Add :com.apple.security.fatal-exceptions array
plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit

plistbuddy Add :com.apple.private.appstored array
plistbuddy Add :com.apple.private.appstored:0 string InstallWebAttribution

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,5 @@
<true/>
<key>com.apple.private.extensionkit.host-requirement-exemption</key>
<true/>
<key>com.apple.security.fatal-exceptions</key>
<array>
<string>jit</string>
</array>
</dict>
</plist>

0 comments on commit 76e01e6

Please sign in to comment.