Provide generic implementation of SSLKeyGenerator functions
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Nov 2018 23:58:42 +0000 (23:58 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Nov 2018 23:58:42 +0000 (23:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191428

Reviewed by Michael Catanzaro.

No new tests. No change in behavior.

Both SSLKeyGeneratorGLib and SSLKeyGeneratorIOS were stub
implementations. Since <keygen> is deprecated it looks unlikely that
an implementation is actually needed, however an implementation is
needed until support is reomved.

* Sources.txt:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/SSLKeyGenerator.cpp: Added.
(WebCore::getSupportedKeySizes):
(WebCore::signedPublicKeyAndChallengeString):
* platform/SourcesGLib.txt:
* platform/glib/SSLKeyGeneratorGLib.cpp: Removed.
* platform/ios/SSLKeyGeneratorIOS.cpp: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Sources.txt
Source/WebCore/SourcesCocoa.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/SSLKeyGenerator.cpp [new file with mode: 0644]
Source/WebCore/platform/SourcesGLib.txt
Source/WebCore/platform/glib/SSLKeyGeneratorGLib.cpp [deleted file]
Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp [deleted file]

index 5f09407..540f029 100644 (file)
@@ -1,3 +1,27 @@
+2018-11-08  Don Olmstead  <don.olmstead@sony.com>
+
+        Provide generic implementation of SSLKeyGenerator functions
+        https://bugs.webkit.org/show_bug.cgi?id=191428
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests. No change in behavior.
+
+        Both SSLKeyGeneratorGLib and SSLKeyGeneratorIOS were stub
+        implementations. Since <keygen> is deprecated it looks unlikely that
+        an implementation is actually needed, however an implementation is
+        needed until support is reomved.
+
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/SSLKeyGenerator.cpp: Added.
+        (WebCore::getSupportedKeySizes):
+        (WebCore::signedPublicKeyAndChallengeString):
+        * platform/SourcesGLib.txt:
+        * platform/glib/SSLKeyGeneratorGLib.cpp: Removed.
+        * platform/ios/SSLKeyGeneratorIOS.cpp: Removed.
+
 2018-11-07  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Unprefix text-decoration CSS3 properties
index d64ab24..f82e456 100644 (file)
@@ -1558,6 +1558,7 @@ platform/Process.cpp
 platform/ReferrerPolicy.cpp
 platform/RemoteCommandListener.cpp
 platform/RuntimeApplicationChecks.cpp
+platform/SSLKeyGenerator.cpp
 platform/SchemeRegistry.cpp
 platform/ScrollAnimator.cpp
 platform/ScrollView.cpp
index 329fa86..d9578c9 100644 (file)
@@ -405,7 +405,6 @@ platform/ios/ScrollAnimatorIOS.mm
 platform/ios/ScrollbarThemeIOS.mm
 platform/ios/ScrollViewIOS.mm
 platform/ios/SelectionRect.cpp
-platform/ios/SSLKeyGeneratorIOS.cpp
 platform/ios/SystemMemoryIOS.cpp
 platform/ios/ThemeIOS.mm @no-unify
 platform/ios/TileControllerMemoryHandlerIOS.cpp
index a62dd78..a56d902 100644 (file)
                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
                4471710B205AF945000A116E /* MediaQueryParserContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryParserContext.cpp; sourceTree = "<group>"; };
                4471710C205AF945000A116E /* MediaQueryParserContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaQueryParserContext.h; sourceTree = "<group>"; };
-               4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGeneratorIOS.cpp; sourceTree = "<group>"; };
                447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
                447958031643B47B001E0A7F /* ParsedContentType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParsedContentType.h; sourceTree = "<group>"; };
                448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLOptionsCollection.h; sourceTree = "<group>"; };
                A31C4E5016E02AC5002F7957 /* OESTextureHalfFloat.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = OESTextureHalfFloat.idl; sourceTree = "<group>"; };
                A31C4E5116E02B08002F7957 /* JSOESTextureHalfFloat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloat.cpp; sourceTree = "<group>"; };
                A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloat.h; sourceTree = "<group>"; };
+               A334BD822194E4610000D77F /* SSLKeyGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGenerator.cpp; sourceTree = "<group>"; };
                A3AF9D81203252EE006CAD06 /* UserAgentCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentCocoa.mm; sourceTree = "<group>"; };
                A3AF9D8220325324006CAD06 /* UserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgent.h; sourceTree = "<group>"; };
                A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentIOS.mm; sourceTree = "<group>"; };
                                E45390340EAFD637003695C8 /* ScrollViewIOS.mm */,
                                BEA807C60F714A0300524199 /* SelectionRect.cpp */,
                                BEA807C70F714A0300524199 /* SelectionRect.h */,
-                               4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */,
                                0F03C0731884695E00A5F8CA /* SystemMemory.h */,
                                E45390AD0EAFF4B5003695C8 /* SystemMemoryIOS.cpp */,
                                44C9919D0F3D210E00586670 /* ThemeIOS.h */,
                                834DFACE1F7DAE5700C2725B /* SharedStringHash.cpp */,
                                834DFACC1F7DAE5600C2725B /* SharedStringHash.h */,
                                93309EA0099EB78C0056E581 /* SharedTimer.h */,
+                               A334BD822194E4610000D77F /* SSLKeyGenerator.cpp */,
                                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
                                F433E9041DBBDBC200EF0D14 /* StaticPasteboard.cpp */,
                                F433E9021DBBDBA200EF0D14 /* StaticPasteboard.h */,
diff --git a/Source/WebCore/platform/SSLKeyGenerator.cpp b/Source/WebCore/platform/SSLKeyGenerator.cpp
new file mode 100644 (file)
index 0000000..79a2e4a
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
+ *
+ * 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"
+#include "SSLKeyGenerator.h"
+
+#if !PLATFORM(MAC) && !PLATFORM(WIN)
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void getSupportedKeySizes(Vector<String>&)
+{
+    notImplemented();
+}
+
+String signedPublicKeyAndChallengeString(unsigned, const String&, const URL&)
+{
+    notImplemented();
+    return String();
+}
+
+} // namespace WebCore
+
+#endif
index b4b942c..54c9837 100644 (file)
@@ -29,7 +29,6 @@ platform/glib/FileSystemGlib.cpp
 platform/glib/KeyedDecoderGlib.cpp
 platform/glib/KeyedEncoderGlib.cpp
 platform/glib/LowPowerModeNotifierGLib.cpp
-platform/glib/SSLKeyGeneratorGLib.cpp
 platform/glib/SharedBufferGlib.cpp
 platform/glib/UserAgentGLib.cpp
 
diff --git a/Source/WebCore/platform/glib/SSLKeyGeneratorGLib.cpp b/Source/WebCore/platform/glib/SSLKeyGeneratorGLib.cpp
deleted file mode 100644 (file)
index 94506f5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * 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.
- */
-
-#include "config.h"
-
-#include "NotImplemented.h"
-#include "URL.h"
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-void getSupportedKeySizes(Vector<String>&)
-{
-    notImplemented();
-}
-
-String signedPublicKeyAndChallengeString(unsigned, const String&, const URL&)
-{
-    notImplemented();
-    return { };
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp b/Source/WebCore/platform/ios/SSLKeyGeneratorIOS.cpp
deleted file mode 100644 (file)
index e268d89..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 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"
-#include "SSLKeyGenerator.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-namespace WebCore {
-
-void getSupportedKeySizes(Vector<String>&)
-{
-}
-
-String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const URL&)
-{
-    UNUSED_PARAM(keySizeIndex);
-    UNUSED_PARAM(challengeString);
-    return String();
-}
-
-} // namespace WebCore
-
-#endif // PLATFORM(IOS_FAMILY)