Diff
Modified: trunk/Source/WebKit/ChangeLog (269787 => 269788)
--- trunk/Source/WebKit/ChangeLog 2020-11-13 21:09:06 UTC (rev 269787)
+++ trunk/Source/WebKit/ChangeLog 2020-11-13 21:11:18 UTC (rev 269788)
@@ -1,3 +1,16 @@
+2020-11-13 Alex Christensen <[email protected]>
+
+ Remove more SecItemShim leftovers
+ https://bugs.webkit.org/show_bug.cgi?id=218919
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/SecItemShim.xcconfig: Removed.
+ * NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm:
+ (NETWORK_SERVICE_INITIALIZER):
+ * PlatformMac.cmake:
+ * WebKit.xcodeproj/project.pbxproj:
+
2020-11-12 Darin Adler <[email protected]>
Remove unused advanced plug-in features: snapshotting and plug-in load policy
Deleted: trunk/Source/WebKit/Configurations/SecItemShim.xcconfig (269787 => 269788)
--- trunk/Source/WebKit/Configurations/SecItemShim.xcconfig 2020-11-13 21:09:06 UTC (rev 269787)
+++ trunk/Source/WebKit/Configurations/SecItemShim.xcconfig 2020-11-13 21:11:18 UTC (rev 269788)
@@ -1,34 +0,0 @@
-//
-// Copyright (C) 2014 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.
-//
-
-#include "Shim.xcconfig"
-
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
-
-ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
-ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm (269787 => 269788)
--- trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm 2020-11-13 21:09:06 UTC (rev 269787)
+++ trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm 2020-11-13 21:11:18 UTC (rev 269788)
@@ -55,9 +55,5 @@
void NETWORK_SERVICE_INITIALIZER(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
{
WTF::initializeMainThread();
-
- // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
- // the this process don't try to insert the shim and crash.
- EnvironmentUtilities::removeValuesEndingWith("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
}
Modified: trunk/Source/WebKit/PlatformMac.cmake (269787 => 269788)
--- trunk/Source/WebKit/PlatformMac.cmake 2020-11-13 21:09:06 UTC (rev 269787)
+++ trunk/Source/WebKit/PlatformMac.cmake 2020-11-13 21:11:18 UTC (rev 269788)
@@ -138,10 +138,6 @@
${XPCService_SOURCES}
)
-list(APPEND NetworkProcess_LIBRARIES
- SecItemShim
-)
-
# FIXME: These should not have Development in production builds.
set(WebProcess_OUTPUT_NAME com.apple.WebKit.WebContent.Development)
set(NetworkProcess_OUTPUT_NAME com.apple.WebKit.Networking.Development)
@@ -457,19 +453,6 @@
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
-set(SecItemShimDirectory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Frameworks)
-add_library(SecItemShim SHARED WebProcess/mac/SecItemShimLibrary.mm)
-WEBKIT_CREATE_SYMLINK(SecItemShim ${SecItemShimDirectory} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Frameworks)
-set_target_properties(SecItemShim PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${SecItemShimDirectory})
-set_target_properties(SecItemShim PROPERTIES PREFIX "")
-target_link_libraries(SecItemShim ${SECURITY_LIBRARY})
-target_include_directories(SecItemShim PRIVATE
- ${CMAKE_BINARY_DIR}
- ${FORWARDING_HEADERS_DIR}
- ${WEBKIT_DIR}
-)
-add_dependencies(SecItemShim WebCore)
-
# FIXME: These should not be necessary.
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (269787 => 269788)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-11-13 21:09:06 UTC (rev 269787)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-11-13 21:11:18 UTC (rev 269788)
@@ -4665,7 +4665,6 @@
A1EA023E1DAC31DB0096021F /* WebContextMenuListenerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuListenerProxy.h; sourceTree = "<group>"; };
A1EDD2D91884ACE000BBFE98 /* All.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = All.xcconfig; sourceTree = "<group>"; };
A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginProcessShim.xcconfig; sourceTree = "<group>"; };
- A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SecItemShim.xcconfig; sourceTree = "<group>"; };
A1FB68221F6E518200C43F9F /* WKCrashReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKCrashReporter.h; sourceTree = "<group>"; };
A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCrashReporter.mm; sourceTree = "<group>"; };
A38A12E123C93AC700FABFA9 /* TextChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextChecker.cpp; sourceTree = "<group>"; };
@@ -5958,7 +5957,6 @@
BC8283F416B4FC5300A278FE /* PluginService.xcconfig */,
37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
A1B89B92221E023300EB4CEA /* SDKVariant.xcconfig */,
- A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
5183B3931379F85C00E8754E /* Shim.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
57A9FF07252BE6E0006A2040 /* WebAuthnService.xcconfig */,
