Diff
Modified: trunk/Source/WebCore/ChangeLog (279490 => 279491)
--- trunk/Source/WebCore/ChangeLog 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/ChangeLog 2021-07-02 01:07:54 UTC (rev 279491)
@@ -1,3 +1,18 @@
+2021-07-01 John Wilander <wilan...@apple.com>
+
+ PCM: Change import from CryptoKitCBridging to CryptoKitPrivate
+ https://bugs.webkit.org/show_bug.cgi?id=227556
+ <rdar://79992592>
+
+ Reviewed by Alex Christensen.
+
+ Patch by Frederic Jacobs.
+
+ No new tests since no functionality is changed.
+
+ * loader/cocoa/PrivateClickMeasurementCocoa.mm:
+ Changed import from CryptoKitCBridgingSoftLink.h to CryptoKitPrivateSoftLink.h.
+
2021-07-01 Alex Christensen <achristen...@webkit.org>
Align beacon CORS mode with Chrome and Firefox
Modified: trunk/Source/WebCore/PAL/ChangeLog (279490 => 279491)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-07-02 01:07:54 UTC (rev 279491)
@@ -1,3 +1,19 @@
+2021-07-01 John Wilander <wilan...@apple.com>
+
+ PCM: Change import from CryptoKitCBridging to CryptoKitPrivate
+ https://bugs.webkit.org/show_bug.cgi?id=227556
+ <rdar://79992592>
+
+ Reviewed by Alex Christensen.
+
+ Patch by Frederic Jacobs.
+
+ * PAL.xcodeproj/project.pbxproj:
+ * pal/PlatformMac.cmake:
+ * pal/cocoa/CryptoKitPrivateSoftLink.h: Renamed from Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h.
+ * pal/cocoa/CryptoKitPrivateSoftLink.mm: Renamed from Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm.
+ * pal/spi/cocoa/CryptoKitPrivateSPI.h: Renamed from Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h.
+
2021-07-01 Amir Mark Jr <amir_m...@apple.com>
Unreviewed, reverting r279452.
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (279490 => 279491)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2021-07-02 01:07:54 UTC (rev 279491)
@@ -140,8 +140,8 @@
570AB8F920AF6E3D00B8BE87 /* NSXPCConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */; };
572A107822B456F500F410C8 /* AuthKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 572A107722B456F500F410C8 /* AuthKitSPI.h */; };
576CA9D622B854AB0030143C /* AppSSOSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 576CA9D522B854AB0030143C /* AppSSOSPI.h */; };
- 57F1C90925DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57F1C90725DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h */; };
- 57F1C90A25DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm */; };
+ 57F1C90925DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */; };
+ 57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */; };
57FD318A22B3593E008D0E8B /* AppSSOSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */; };
57FD318B22B35989008D0E8B /* AppSSOSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD318822B3592F008D0E8B /* AppSSOSoftLink.h */; };
5C7C787323AC3E770065F47E /* ManagedConfigurationSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7C787123AC3E770065F47E /* ManagedConfigurationSoftLink.h */; };
@@ -200,7 +200,7 @@
CDACB361238742740018D7CE /* MediaToolboxSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = CDACB35F23873E480018D7CE /* MediaToolboxSoftLink.h */; };
CDF91113220E4EEC001EA39E /* CelestialSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF91112220E4EEC001EA39E /* CelestialSPI.h */; };
CE5673872151A7B9002F92D7 /* IOKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5673862151A7B9002F92D7 /* IOKitSPI.h */; };
- DF83E209263734F1000825EF /* CryptoKitCBridgingSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DF83E208263734F1000825EF /* CryptoKitCBridgingSPI.h */; };
+ DF83E209263734F1000825EF /* CryptoKitPrivateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */; };
E327C0DF260BE436002281C5 /* NotifySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E327C0DE260BDC90002281C5 /* NotifySPI.h */; };
E5D45D122106A07400D2B738 /* NSColorWellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D45D112106A07400D2B738 /* NSColorWellSPI.h */; };
E5D45D142106A18700D2B738 /* NSPopoverColorWellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D45D132106A18700D2B738 /* NSPopoverColorWellSPI.h */; };
@@ -360,8 +360,8 @@
570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSXPCConnectionSPI.h; sourceTree = "<group>"; };
572A107722B456F500F410C8 /* AuthKitSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AuthKitSPI.h; sourceTree = "<group>"; };
576CA9D522B854AB0030143C /* AppSSOSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppSSOSPI.h; sourceTree = "<group>"; };
- 57F1C90725DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CryptoKitCBridgingSoftLink.h; sourceTree = "<group>"; };
- 57F1C90825DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CryptoKitCBridgingSoftLink.mm; sourceTree = "<group>"; };
+ 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSoftLink.h; sourceTree = "<group>"; };
+ 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CryptoKitPrivateSoftLink.mm; sourceTree = "<group>"; };
57FD318822B3592F008D0E8B /* AppSSOSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppSSOSoftLink.h; sourceTree = "<group>"; };
57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppSSOSoftLink.mm; sourceTree = "<group>"; };
5C7C787123AC3E770065F47E /* ManagedConfigurationSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManagedConfigurationSoftLink.h; sourceTree = "<group>"; };
@@ -425,7 +425,7 @@
CDACB35F23873E480018D7CE /* MediaToolboxSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaToolboxSoftLink.h; sourceTree = "<group>"; };
CDF91112220E4EEC001EA39E /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; };
- DF83E208263734F1000825EF /* CryptoKitCBridgingSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitCBridgingSPI.h; sourceTree = "<group>"; };
+ DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSPI.h; sourceTree = "<group>"; };
E327C0DE260BDC90002281C5 /* NotifySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotifySPI.h; sourceTree = "<group>"; };
E5D45D112106A07400D2B738 /* NSColorWellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSColorWellSPI.h; sourceTree = "<group>"; };
E5D45D132106A18700D2B738 /* NSPopoverColorWellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPopoverColorWellSPI.h; sourceTree = "<group>"; };
@@ -526,7 +526,7 @@
7A36D0F8223AD9AB00B0522E /* CommonCryptoSPI.h */,
ABCA536724895DB900361BFF /* CoreMotionSPI.h */,
C138EA1A2436447200656DF1 /* CoreServicesSPI.h */,
- DF83E208263734F1000825EF /* CryptoKitCBridgingSPI.h */,
+ DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */,
0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */,
1D12CC4A2411BCAE00FDA0A3 /* FeatureFlagsSPI.h */,
CE5673862151A7B9002F92D7 /* IOKitSPI.h */,
@@ -733,8 +733,8 @@
57FD318922B3593E008D0E8B /* AppSSOSoftLink.mm */,
077E87B0226A460200A2AFF0 /* AVFoundationSoftLink.h */,
077E87AF226A460200A2AFF0 /* AVFoundationSoftLink.mm */,
- 57F1C90725DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h */,
- 57F1C90825DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm */,
+ 57F1C90725DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h */,
+ 57F1C90825DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm */,
F4DDD01A264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.h */,
F4DDD019264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.mm */,
F44291661FA52705002CC93E /* FileSizeFormatterCocoa.mm */,
@@ -883,8 +883,8 @@
1CCEE4F520D871930047B097 /* CoreUISPI.h in Headers */,
0C5AF9191F43A4C7002EAC02 /* CoreUISPI.h in Headers */,
1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
- 57F1C90925DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.h in Headers */,
- DF83E209263734F1000825EF /* CryptoKitCBridgingSPI.h in Headers */,
+ 57F1C90925DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.h in Headers */,
+ DF83E209263734F1000825EF /* CryptoKitPrivateSPI.h in Headers */,
F4DDD01C264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.h in Headers */,
0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */,
F4E0875B266ACA53000F814A /* DataDetectorsSoftLink.h in Headers */,
@@ -1103,7 +1103,7 @@
0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */,
1C77C8C925D7972000635E0C /* CoreTextSoftLink.cpp in Sources */,
1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
- 57F1C90A25DCF0CF00E8F6EA /* CryptoKitCBridgingSoftLink.mm in Sources */,
+ 57F1C90A25DCF0CF00E8F6EA /* CryptoKitPrivateSoftLink.mm in Sources */,
F4DDD01B264DC69E00EF1B91 /* DataDetectorsCoreSoftLink.mm in Sources */,
F4E0875C266ACA53000F814A /* DataDetectorsSoftLink.mm in Sources */,
A1175B581F6B470500C4B9F0 /* DefaultSearchProvider.cpp in Sources */,
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (279490 => 279491)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-07-02 01:07:54 UTC (rev 279491)
@@ -11,7 +11,7 @@
cocoa/AppSSOSoftLink.h
cocoa/AVFoundationSoftLink.h
- cocoa/CryptoKitCBridgingSoftLink.h
+ cocoa/CryptoKitPrivateSoftLink.h
cocoa/DataDetectorsCoreSoftLink.h
cocoa/MediaToolboxSoftLink.h
cocoa/OpenGLSoftLinkCocoa.h
Deleted: trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h (279490 => 279491)
--- trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h 2021-07-02 01:07:54 UTC (rev 279491)
@@ -1,37 +0,0 @@
-/*
- * 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. 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
-
-#if HAVE(RSA_BSSA)
-
-#import <pal/spi/cocoa/CryptoKitCBridgingSPI.h>
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CryptoKitCBridging);
-
-SOFT_LINK_CLASS_FOR_HEADER(PAL, RSABSSATokenBlinder);
-
-#endif
Deleted: trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm (279490 => 279491)
--- trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm 2021-07-02 01:07:54 UTC (rev 279491)
@@ -1,36 +0,0 @@
-/*
- * 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. 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 "config.h"
-
-#if HAVE(RSA_BSSA)
-
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitCBridging, PAL_EXPORT);
-
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitCBridging, RSABSSATokenBlinder, PAL_EXPORT);
-
-#endif
Copied: trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.h (from rev 279490, trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.h) (0 => 279491)
--- trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.h 2021-07-02 01:07:54 UTC (rev 279491)
@@ -0,0 +1,37 @@
+/*
+ * 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. 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
+
+#if HAVE(RSA_BSSA)
+
+#import <pal/spi/cocoa/CryptoKitPrivateSPI.h>
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CryptoKitPrivate);
+
+SOFT_LINK_CLASS_FOR_HEADER(PAL, RSABSSATokenBlinder);
+
+#endif
Copied: trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.mm (from rev 279490, trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitCBridgingSoftLink.mm) (0 => 279491)
--- trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.mm (rev 0)
+++ trunk/Source/WebCore/PAL/pal/cocoa/CryptoKitPrivateSoftLink.mm 2021-07-02 01:07:54 UTC (rev 279491)
@@ -0,0 +1,36 @@
+/*
+ * 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. 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 "config.h"
+
+#if HAVE(RSA_BSSA)
+
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitPrivate, PAL_EXPORT);
+
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, CryptoKitPrivate, RSABSSATokenBlinder, PAL_EXPORT);
+
+#endif
Deleted: trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h (279490 => 279491)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h 2021-07-02 01:07:54 UTC (rev 279491)
@@ -1,59 +0,0 @@
-/*
- * 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. 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
-
-#if HAVE(RSA_BSSA)
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <CryptoKitCBridging/RSABSSA.h>
-
-#else
-
-@interface RSABSSATokenWaitingActivation : NSObject
-#if HAVE(RSA_BSSA)
-- (RSABSSATokenReady*)activateTokenWithServerResponse:(NSData*)serverResponse error:(NSError* __autoreleasing *)error;
-#endif
-@property (nonatomic, retain, readonly) NSData* blindedMessage;
-@end
-
-@interface RSABSSATokenReady : NSObject
-@property (nonatomic, retain, readonly) NSData* tokenContent;
-@property (nonatomic, retain, readonly) NSData* keyId;
-@property (nonatomic, retain, readonly) NSData* signature;
-@end
-
-#if HAVE(RSA_BSSA)
-@interface RSABSSATokenBlinder : NSObject
-- (instancetype)initWithPublicKey:(NSData*)spkiBytes error:(NSError* __autoreleasing *)error;
-- (RSABSSATokenWaitingActivation*)tokenWaitingActivationWithContent:(NSData*)content error:(NSError* __autoreleasing *)error;
-@property (nonatomic, retain, readonly) NSData* keyId;
-@end
-#endif
-
-#endif // USE(APPLE_INTERNAL_SDK)
-
-#endif // HAVE(RSA_BSSA)
Copied: trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitPrivateSPI.h (from rev 279490, trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitCBridgingSPI.h) (0 => 279491)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitPrivateSPI.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/CryptoKitPrivateSPI.h 2021-07-02 01:07:54 UTC (rev 279491)
@@ -0,0 +1,64 @@
+/*
+ * 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. 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
+
+#if HAVE(RSA_BSSA)
+
+#if USE(APPLE_INTERNAL_SDK)
+
+// FIXME(227598): Remove conditional once CryptoKitPrivate/RSABSSA.h is available.
+#if __has_include(<CryptoKitPrivate/RSABSSA.h>)
+#import <CryptoKitPrivate/RSABSSA.h>
+#else
+#import <CryptoKitCBridging/RSABSSA.h>
+#endif
+
+#else
+
+@interface RSABSSATokenWaitingActivation : NSObject
+#if HAVE(RSA_BSSA)
+- (RSABSSATokenReady*)activateTokenWithServerResponse:(NSData*)serverResponse error:(NSError* __autoreleasing *)error;
+#endif
+@property (nonatomic, retain, readonly) NSData* blindedMessage;
+@end
+
+@interface RSABSSATokenReady : NSObject
+@property (nonatomic, retain, readonly) NSData* tokenContent;
+@property (nonatomic, retain, readonly) NSData* keyId;
+@property (nonatomic, retain, readonly) NSData* signature;
+@end
+
+#if HAVE(RSA_BSSA)
+@interface RSABSSATokenBlinder : NSObject
+- (instancetype)initWithPublicKey:(NSData*)spkiBytes error:(NSError* __autoreleasing *)error;
+- (RSABSSATokenWaitingActivation*)tokenWaitingActivationWithContent:(NSData*)content error:(NSError* __autoreleasing *)error;
+@property (nonatomic, retain, readonly) NSData* keyId;
+@end
+#endif
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // HAVE(RSA_BSSA)
Modified: trunk/Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm (279490 => 279491)
--- trunk/Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm 2021-07-02 01:03:53 UTC (rev 279490)
+++ trunk/Source/WebCore/loader/cocoa/PrivateClickMeasurementCocoa.mm 2021-07-02 01:07:54 UTC (rev 279491)
@@ -26,7 +26,7 @@
#import "config.h"
#import "PrivateClickMeasurement.h"
-#import <pal/cocoa/CryptoKitCBridgingSoftLink.h>
+#import <pal/cocoa/CryptoKitPrivateSoftLink.h>
namespace WebCore {
