Rename CryptoAlgorithmParameters to CryptoAlgorithmParametersDeprecated

author jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)

committer jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)
author jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)
committer jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index b01fedc..5f08bd6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,67 @@
+2016-10-10  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Rename CryptoAlgorithmParameters to CryptoAlgorithmParametersDeprecated
+        https://bugs.webkit.org/show_bug.cgi?id=163163
+        <rdar://problem/28681544>
+
+        Reviewed by Brent Fulgham.
+
+        Replace all uses of 'CryptoAlgorithmParameters' with 'CryptoAlgorithmParametersDeprecated' in preparation for a new CryptoAlgorithmParameters type.
+
+        No changes of behaviors. No new tests.
+
+        * Modules/encryptedmedia/CDMSessionClearKey.cpp:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSCryptoAlgorithmDictionary.cpp:
+        * bindings/js/JSCryptoAlgorithmDictionary.h:
+        * bindings/js/JSCryptoKeySerializationJWK.cpp:
+        * bindings/js/JSCryptoKeySerializationJWK.h:
+        * bindings/js/JSWebKitSubtleCryptoCustom.cpp:
+        * crypto/CryptoAlgorithm.cpp:
+        * crypto/CryptoAlgorithm.h:
+        * crypto/CryptoAlgorithmParametersDeprecated.h: Renamed from Source/WebCore/crypto/CryptoAlgorithmParameters.h.
+        * crypto/CryptoKeySerialization.h:
+        * crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
+        * crypto/algorithms/CryptoAlgorithmAES_CBC.h:
+        * crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
+        * crypto/algorithms/CryptoAlgorithmAES_KW.h:
+        * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
+        * crypto/algorithms/CryptoAlgorithmHMAC.h:
+        * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
+        * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h:
+        * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
+        * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h:
+        * crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
+        * crypto/algorithms/CryptoAlgorithmRSA_OAEP.h:
+        * crypto/algorithms/CryptoAlgorithmSHA1.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA1.h:
+        * crypto/algorithms/CryptoAlgorithmSHA224.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA224.h:
+        * crypto/algorithms/CryptoAlgorithmSHA256.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA256.h:
+        * crypto/algorithms/CryptoAlgorithmSHA384.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA384.h:
+        * crypto/algorithms/CryptoAlgorithmSHA512.cpp:
+        * crypto/algorithms/CryptoAlgorithmSHA512.h:
+        * crypto/keys/CryptoKeySerializationRaw.cpp:
+        * crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp:
+        * crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp:
+        * crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp:
+        * crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp:
+        * crypto/keys/CryptoKeySerializationRaw.h:
+        * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
+        * crypto/mac/CryptoAlgorithmHMACMac.cpp:
+        * crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
+        * crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
+        * crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h.
+        * crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParams.h.
+        * crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h.
+        * crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParams.h.
+        * crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParams.h.
+        * crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHash.h.
+        * crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h.
+        * crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h: Renamed from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParams.h.
+
  2016-10-10  Darin Adler  <darin@apple.com>
  
          Move NotificationCenter from legacy to new DOM exceptions
diff --git a/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp b/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp

index e97ce7c..a4a8f5f 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp
+++ b/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp
@@ -29,7 +29,6 @@
  #include "ArrayValue.h"
  #include "CryptoAlgorithm.h"
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
  #include "CryptoKeyDataOctetSequence.h"
  #include "Dictionary.h"
  #include "JSMainThreadExecState.h"
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 23b88ea..4af5876 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5957,7 +5957,7 @@
                 E125F8351822F18A00D84CD9 /* CryptoKeyHMAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F8331822F18A00D84CD9 /* CryptoKeyHMAC.cpp */; };
                 E125F8361822F18A00D84CD9 /* CryptoKeyHMAC.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8341822F18A00D84CD9 /* CryptoKeyHMAC.h */; };
                 E125F8381822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F8371822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp */; };
-               E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h */; };
+               E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */; };
                 E125F83D182411E700D84CD9 /* JSCryptoOperationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F83B182411E700D84CD9 /* JSCryptoOperationData.cpp */; };
                 E125F83E182411E700D84CD9 /* JSCryptoOperationData.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */; };
                 E125F8411824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F83F1824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp */; };
@@ -6051,9 +6051,9 @@
                 E19AC3F31824DC7900349426 /* CryptoAlgorithmSHA384.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3EB1824DC7900349426 /* CryptoAlgorithmSHA384.h */; };
                 E19AC3F41824DC7900349426 /* CryptoAlgorithmSHA512.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E19AC3EC1824DC7900349426 /* CryptoAlgorithmSHA512.cpp */; };
                 E19AC3F51824DC7900349426 /* CryptoAlgorithmSHA512.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3ED1824DC7900349426 /* CryptoAlgorithmSHA512.h */; };
-               E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h */; };
+               E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */; };
                 E19AC3F9182566F700349426 /* CryptoKeyMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E19AC3F8182566F700349426 /* CryptoKeyMac.cpp */; };
-               E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParams.h */; };
+               E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */; };
                 E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */; };
                 E1A3162D134BC32D007C9A4F /* WebNSAttributedStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E1A3162E134BC32D007C9A4F /* WebNSAttributedStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1A3162C134BC32D007C9A4F /* WebNSAttributedStringExtras.mm */; };
@@ -6080,12 +6080,12 @@
                 E1BB84AD1822CA7400525043 /* CryptoAlgorithmRegistryMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BB84AC1822CA7400525043 /* CryptoAlgorithmRegistryMac.cpp */; };
                 E1BD3319182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */; };
                 E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */; };
-               E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h */; };
-               E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h */; };
+               E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */; };
+               E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */; };
                 E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */; };
                 E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */; };
                 E1C266D818317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C266D618317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp */; };
-               E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h */; };
+               E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */; };
                 E1C266DE18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C266DC18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp */; };
                 E1C266DF18319F31003F8B33 /* CryptoKeyDataRSAComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C266DD18319F31003F8B33 /* CryptoKeyDataRSAComponents.h */; };
                 E1C362EF0EAF2AA9007410BC /* JSWorkerLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C362ED0EAF2AA9007410BC /* JSWorkerLocation.h */; };
@@ -6102,9 +6102,9 @@
                 E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */; };
                 E1C657121815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */; };
                 E1C657131815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657111815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h */; };
-               E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */; };
+               E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */; };
                 E1C657251816E69D00256CDD /* CryptoAlgorithmIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */; };
-               E1C657271816F9FE00256CDD /* CryptoAlgorithmParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657261816F9FE00256CDD /* CryptoAlgorithmParameters.h */; };
+               E1C657271816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */; };
                 E1C8BE5D0E8BD15A0064CB7D /* JSWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */; };
                 E1C94AF9191303F000D5A893 /* BlobPart.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C94AF7191303F000D5A893 /* BlobPart.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E1CA5CBC0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */; };
@@ -6134,7 +6134,7 @@
                 E1FE1370183FECF000892F13 /* CryptoAlgorithmRSA_OAEPMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE136E183FECF000892F13 /* CryptoAlgorithmRSA_OAEPMac.cpp */; };
                 E1FE137418402A6700892F13 /* CommonCryptoUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE137218402A6700892F13 /* CommonCryptoUtilities.cpp */; };
                 E1FE137518402A6700892F13 /* CommonCryptoUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE137318402A6700892F13 /* CommonCryptoUtilities.h */; };
-               E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h */; };
+               E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */; };
                 E1FE137A184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE1378184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp */; };
                 E1FE137B184D21BB00892F13 /* CryptoAlgorithmAES_KW.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE1379184D21BB00892F13 /* CryptoAlgorithmAES_KW.h */; };
                 E1FE137E184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE137C184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp */; };
@@ -13571,7 +13571,7 @@
                 E125F8331822F18A00D84CD9 /* CryptoKeyHMAC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyHMAC.cpp; sourceTree = "<group>"; };
                 E125F8341822F18A00D84CD9 /* CryptoKeyHMAC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyHMAC.h; sourceTree = "<group>"; };
                 E125F8371822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmHMACMac.cpp; sourceTree = "<group>"; };
-               E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesCbcParams.h; sourceTree = "<group>"; };
+               E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesCbcParamsDeprecated.h; sourceTree = "<group>"; };
                 E125F83B182411E700D84CD9 /* JSCryptoOperationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoOperationData.cpp; sourceTree = "<group>"; };
                 E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoOperationData.h; sourceTree = "<group>"; };
                 E125F83F1824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_CBC.cpp; sourceTree = "<group>"; };
@@ -13671,9 +13671,9 @@
                 E19AC3EB1824DC7900349426 /* CryptoAlgorithmSHA384.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmSHA384.h; sourceTree = "<group>"; };
                 E19AC3EC1824DC7900349426 /* CryptoAlgorithmSHA512.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmSHA512.cpp; sourceTree = "<group>"; };
                 E19AC3ED1824DC7900349426 /* CryptoAlgorithmSHA512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmSHA512.h; sourceTree = "<group>"; };
-               E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesKeyGenParams.h; sourceTree = "<group>"; };
+               E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesKeyGenParamsDeprecated.h; sourceTree = "<group>"; };
                 E19AC3F8182566F700349426 /* CryptoKeyMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyMac.cpp; sourceTree = "<group>"; };
-               E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacKeyParams.h; sourceTree = "<group>"; };
+               E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacKeyParamsDeprecated.h; sourceTree = "<group>"; };
                 E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerNodeAlgorithms.h; sourceTree = "<group>"; };
                 E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNSAttributedStringExtras.h; sourceTree = "<group>"; };
                 E1A3162C134BC32D007C9A4F /* WebNSAttributedStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSAttributedStringExtras.mm; sourceTree = "<group>"; };
@@ -13707,14 +13707,14 @@
                 E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libWebCoreTestShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                 E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreTestShimLibrary.cpp; sourceTree = "<group>"; };
                 E1BB84AC1822CA7400525043 /* CryptoAlgorithmRegistryMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistryMac.cpp; sourceTree = "<group>"; };
-               E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp; sourceTree = "<group>"; };
-               E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.h; sourceTree = "<group>"; };
-               E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaSsaParams.h; sourceTree = "<group>"; };
-               E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyGenParams.h; sourceTree = "<group>"; };
+               E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+               E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CryptoAlgorithmRsaSsaParamsDeprecated.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+               E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyGenParamsDeprecated.h; sourceTree = "<group>"; };
                 E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTUnicodeSort.cpp; sourceTree = "<group>"; };
                 E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTUnicodeSort.h; sourceTree = "<group>"; };
-               E1C266D618317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp; sourceTree = "<group>"; };
-               E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyParamsWithHash.h; sourceTree = "<group>"; };
+               E1C266D618317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+               E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h; sourceTree = "<group>"; };
                 E1C266DC18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyDataRSAComponents.cpp; sourceTree = "<group>"; };
                 E1C266DD18319F31003F8B33 /* CryptoKeyDataRSAComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyDataRSAComponents.h; sourceTree = "<group>"; };
                 E1C362ED0EAF2AA9007410BC /* JSWorkerLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerLocation.h; sourceTree = "<group>"; };
@@ -13729,11 +13729,11 @@
                 E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossOriginAccessControl.cpp; sourceTree = "<group>"; };
                 E1C4DE680EA75C1E0023CCD6 /* ActiveDOMObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActiveDOMObject.h; sourceTree = "<group>"; };
                 E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActiveDOMObject.cpp; sourceTree = "<group>"; };
-               E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoAlgorithmDictionary.cpp; sourceTree = "<group>"; };
+               E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSCryptoAlgorithmDictionary.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
                 E1C657111815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoAlgorithmDictionary.h; sourceTree = "<group>"; };
-               E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacParams.h; sourceTree = "<group>"; };
+               E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacParamsDeprecated.h; sourceTree = "<group>"; };
                 E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmIdentifier.h; sourceTree = "<group>"; };
-               E1C657261816F9FE00256CDD /* CryptoAlgorithmParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmParameters.h; sourceTree = "<group>"; };
+               E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmParametersDeprecated.h; sourceTree = "<group>"; };
                 E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; lineEnding = 0; path = DOMWindowConstructors.idl; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
                 E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorker.cpp; sourceTree = "<group>"; };
                 E1C94AF7191303F000D5A893 /* BlobPart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobPart.h; sourceTree = "<group>"; };
@@ -13765,7 +13765,7 @@
                 E1FE136E183FECF000892F13 /* CryptoAlgorithmRSA_OAEPMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSA_OAEPMac.cpp; sourceTree = "<group>"; };
                 E1FE137218402A6700892F13 /* CommonCryptoUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonCryptoUtilities.cpp; sourceTree = "<group>"; };
                 E1FE137318402A6700892F13 /* CommonCryptoUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoUtilities.h; sourceTree = "<group>"; };
-               E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaOaepParams.h; sourceTree = "<group>"; };
+               E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaOaepParamsDeprecated.h; sourceTree = "<group>"; };
                 E1FE1378184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_KW.cpp; sourceTree = "<group>"; };
                 E1FE1379184D21BB00892F13 /* CryptoAlgorithmAES_KW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAES_KW.h; sourceTree = "<group>"; };
                 E1FE137C184D270200892F13 /* CryptoAlgorithmAES_KWMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_KWMac.cpp; sourceTree = "<group>"; };
@@ -22156,14 +22156,14 @@
                 E1C657141816015F00256CDD /* parameters */ = {
                         isa = PBXGroup;
                         children = (
-                               E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h */,
-                               E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h */,
-                               E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParams.h */,
-                               E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */,
-                               E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h */,
-                               E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h */,
-                               E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h */,
-                               E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h */,
+                               E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */,
+                               E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */,
+                               E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */,
+                               E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */,
+                               E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */,
+                               E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */,
+                               E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */,
+                               E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */,
                         );
                         path = parameters;
                         sourceTree = "<group>";
@@ -22284,7 +22284,7 @@
                                 E172AF6B180F24C600FBADB9 /* CryptoAlgorithm.cpp */,
                                 E172AF6C180F24C600FBADB9 /* CryptoAlgorithm.h */,
                                 E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */,
-                               E1C657261816F9FE00256CDD /* CryptoAlgorithmParameters.h */,
+                               E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */,
                                 E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */,
                                 E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */,
                                 E157A8E218173A3A009F821D /* CryptoKey.cpp */,
@@ -24209,21 +24209,21 @@
                                 E172AF6E180F24C600FBADB9 /* CryptoAlgorithm.h in Headers */,
                                 E125F8421824253A00D84CD9 /* CryptoAlgorithmAES_CBC.h in Headers */,
                                 E1FE137B184D21BB00892F13 /* CryptoAlgorithmAES_KW.h in Headers */,
-                               E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParams.h in Headers */,
-                               E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParams.h in Headers */,
+                               E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h in Headers */,
+                               E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h in Headers */,
                                 E125F8321822F11B00D84CD9 /* CryptoAlgorithmHMAC.h in Headers */,
-                               E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParams.h in Headers */,
-                               E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParams.h in Headers */,
+                               E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h in Headers */,
+                               E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h in Headers */,
                                 E1C657251816E69D00256CDD /* CryptoAlgorithmIdentifier.h in Headers */,
-                               E1C657271816F9FE00256CDD /* CryptoAlgorithmParameters.h in Headers */,
+                               E1C657271816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h in Headers */,
                                 E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */,
                                 E1FE136B183FE1AB00892F13 /* CryptoAlgorithmRSA_OAEP.h in Headers */,
                                 E1233F0D185A3E3B008DFAF5 /* CryptoAlgorithmRSAES_PKCS1_v1_5.h in Headers */,
-                               E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h in Headers */,
-                               E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h in Headers */,
-                               E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h in Headers */,
+                               E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h in Headers */,
+                               E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h in Headers */,
+                               E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h in Headers */,
                                 E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */,
-                               E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h in Headers */,
+                               E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h in Headers */,
                                 E125F82C1822CFEC00D84CD9 /* CryptoAlgorithmSHA1.h in Headers */,
                                 E19AC3EF1824DC7900349426 /* CryptoAlgorithmSHA224.h in Headers */,
                                 E19AC3F11824DC7900349426 /* CryptoAlgorithmSHA256.h in Headers */,
diff --git a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp

index 03c8013..76d5dcd 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp
@@ -28,15 +28,15 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmAesCbcParams.h"
-#include "CryptoAlgorithmAesKeyGenParams.h"
-#include "CryptoAlgorithmHmacKeyParams.h"
-#include "CryptoAlgorithmHmacParams.h"
+#include "CryptoAlgorithmAesCbcParamsDeprecated.h"
+#include "CryptoAlgorithmAesKeyGenParamsDeprecated.h"
+#include "CryptoAlgorithmHmacKeyParamsDeprecated.h"
+#include "CryptoAlgorithmHmacParamsDeprecated.h"
  #include "CryptoAlgorithmRegistry.h"
-#include "CryptoAlgorithmRsaKeyGenParams.h"
-#include "CryptoAlgorithmRsaKeyParamsWithHash.h"
-#include "CryptoAlgorithmRsaOaepParams.h"
-#include "CryptoAlgorithmRsaSsaParams.h"
+#include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
+#include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
+#include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
+#include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
  #include "ExceptionCode.h"
  #include "JSCryptoOperationData.h"
  #include "JSDOMBinding.h"
@@ -123,7 +123,7 @@ static bool getHashAlgorithm(JSDictionary& dictionary, CryptoAlgorithmIdentifier
      return JSCryptoAlgorithmDictionary::getAlgorithmIdentifier(exec, hash, result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createAesCbcParams(ExecState* exec, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createAesCbcParams(ExecState* exec, JSValue value)
  {
      VM& vm = exec->vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -136,7 +136,7 @@ static RefPtr<CryptoAlgorithmParameters> createAesCbcParams(ExecState* exec, JSV
      JSValue iv = getProperty(exec, value.getObject(), "iv");
      RETURN_IF_EXCEPTION(scope, nullptr);
  
-    auto result = adoptRef(*new CryptoAlgorithmAesCbcParams);
+    auto result = adoptRef(*new CryptoAlgorithmAesCbcParamsDeprecated);
  
      CryptoOperationData ivData;
      auto success = cryptoOperationDataFromJSValue(exec, iv, ivData);
@@ -154,7 +154,7 @@ static RefPtr<CryptoAlgorithmParameters> createAesCbcParams(ExecState* exec, JSV
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createAesKeyGenParams(ExecState& state, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createAesKeyGenParams(ExecState& state, JSValue value)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -164,7 +164,7 @@ static RefPtr<CryptoAlgorithmParameters> createAesKeyGenParams(ExecState& state,
          return nullptr;
      }
  
-    auto result = adoptRef(*new CryptoAlgorithmAesKeyGenParams);
+    auto result = adoptRef(*new CryptoAlgorithmAesKeyGenParamsDeprecated);
  
      JSValue lengthValue = getProperty(&state, value.getObject(), "length");
      RETURN_IF_EXCEPTION(scope, nullptr);
@@ -174,7 +174,7 @@ static RefPtr<CryptoAlgorithmParameters> createAesKeyGenParams(ExecState& state,
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createHmacParams(ExecState& state, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createHmacParams(ExecState& state, JSValue value)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -185,7 +185,7 @@ static RefPtr<CryptoAlgorithmParameters> createHmacParams(ExecState& state, JSVa
      }
  
      JSDictionary jsDictionary(&state, value.getObject());
-    auto result = adoptRef(*new CryptoAlgorithmHmacParams);
+    auto result = adoptRef(*new CryptoAlgorithmHmacParamsDeprecated);
  
      auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
      ASSERT_UNUSED(scope, scope.exception() || success);
@@ -195,7 +195,7 @@ static RefPtr<CryptoAlgorithmParameters> createHmacParams(ExecState& state, JSVa
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createHmacKeyParams(ExecState& state, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createHmacKeyParams(ExecState& state, JSValue value)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -206,7 +206,7 @@ static RefPtr<CryptoAlgorithmParameters> createHmacKeyParams(ExecState& state, J
      }
  
      JSDictionary jsDictionary(&state, value.getObject());
-    auto result = adoptRef(*new CryptoAlgorithmHmacKeyParams);
+    auto result = adoptRef(*new CryptoAlgorithmHmacKeyParamsDeprecated);
  
      auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
      ASSERT(scope.exception() || success);
@@ -219,7 +219,7 @@ static RefPtr<CryptoAlgorithmParameters> createHmacKeyParams(ExecState& state, J
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createRsaKeyGenParams(ExecState& state, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createRsaKeyGenParams(ExecState& state, JSValue value)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -230,7 +230,7 @@ static RefPtr<CryptoAlgorithmParameters> createRsaKeyGenParams(ExecState& state,
      }
  
      JSDictionary jsDictionary(&state, value.getObject());
-    auto result = adoptRef(*new CryptoAlgorithmRsaKeyGenParams);
+    auto result = adoptRef(*new CryptoAlgorithmRsaKeyGenParamsDeprecated);
  
      JSValue modulusLengthValue = getProperty(&state, value.getObject(), "modulusLength");
      RETURN_IF_EXCEPTION(scope, nullptr);
@@ -254,13 +254,13 @@ static RefPtr<CryptoAlgorithmParameters> createRsaKeyGenParams(ExecState& state,
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createRsaKeyParamsWithHash(ExecState&, JSValue)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createRsaKeyParamsWithHash(ExecState&, JSValue)
  {
      // WebCrypto RSA algorithms currently do not take any parameters to importKey.
-    return adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHash);
+    return adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHashDeprecated);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createRsaOaepParams(ExecState* exec, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createRsaOaepParams(ExecState* exec, JSValue value)
  {
      VM& vm = exec->vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -271,7 +271,7 @@ static RefPtr<CryptoAlgorithmParameters> createRsaOaepParams(ExecState* exec, JS
      }
  
      JSDictionary jsDictionary(exec, value.getObject());
-    auto result = adoptRef(*new CryptoAlgorithmRsaOaepParams);
+    auto result = adoptRef(*new CryptoAlgorithmRsaOaepParamsDeprecated);
  
      auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
      ASSERT(scope.exception() || success);
@@ -296,7 +296,7 @@ static RefPtr<CryptoAlgorithmParameters> createRsaOaepParams(ExecState* exec, JS
      return WTFMove(result);
  }
  
-static RefPtr<CryptoAlgorithmParameters> createRsaSsaParams(ExecState& state, JSValue value)
+static RefPtr<CryptoAlgorithmParametersDeprecated> createRsaSsaParams(ExecState& state, JSValue value)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -307,7 +307,7 @@ static RefPtr<CryptoAlgorithmParameters> createRsaSsaParams(ExecState& state, JS
      }
  
      JSDictionary jsDictionary(&state, value.getObject());
-    auto result = adoptRef(*new CryptoAlgorithmRsaSsaParams);
+    auto result = adoptRef(*new CryptoAlgorithmRsaSsaParamsDeprecated);
  
      auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
      ASSERT(scope.exception() || success);
@@ -317,11 +317,11 @@ static RefPtr<CryptoAlgorithmParameters> createRsaSsaParams(ExecState& state, JS
      return WTFMove(result);
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForEncrypt(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForEncrypt(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5:
      case CryptoAlgorithmIdentifier::RSA_PSS:
          setDOMException(exec, NOT_SUPPORTED_ERR);
@@ -341,7 +341,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
          setDOMException(exec, NOT_SUPPORTED_ERR);
          return nullptr;
      case CryptoAlgorithmIdentifier::AES_KW:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::HMAC:
      case CryptoAlgorithmIdentifier::DH:
      case CryptoAlgorithmIdentifier::SHA_1:
@@ -359,11 +359,11 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForDecrypt(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForDecrypt(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5:
      case CryptoAlgorithmIdentifier::RSA_PSS:
          setDOMException(exec, NOT_SUPPORTED_ERR);
@@ -383,7 +383,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
          setDOMException(exec, NOT_SUPPORTED_ERR);
          return nullptr;
      case CryptoAlgorithmIdentifier::AES_KW:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::HMAC:
      case CryptoAlgorithmIdentifier::DH:
      case CryptoAlgorithmIdentifier::SHA_1:
@@ -401,7 +401,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForSign(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForSign(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -439,7 +439,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForVerify(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForVerify(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -477,7 +477,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForDigest(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForDigest(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -501,7 +501,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      case CryptoAlgorithmIdentifier::SHA_256:
      case CryptoAlgorithmIdentifier::SHA_384:
      case CryptoAlgorithmIdentifier::SHA_512:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::CONCAT:
      case CryptoAlgorithmIdentifier::HKDF_CTR:
      case CryptoAlgorithmIdentifier::PBKDF2:
@@ -512,7 +512,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForGenerateKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForGenerateKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -549,7 +549,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForDeriveKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForDeriveKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -581,7 +581,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForDeriveBits(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForDeriveBits(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -613,7 +613,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForImportKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForImportKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue value)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -629,11 +629,11 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      case CryptoAlgorithmIdentifier::AES_GCM:
      case CryptoAlgorithmIdentifier::AES_CFB:
      case CryptoAlgorithmIdentifier::AES_KW:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::HMAC:
          return createHmacParams(*exec, value);
      case CryptoAlgorithmIdentifier::DH:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::SHA_1:
      case CryptoAlgorithmIdentifier::SHA_224:
      case CryptoAlgorithmIdentifier::SHA_256:
@@ -649,7 +649,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      return nullptr;
  }
  
-RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersForExportKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
+RefPtr<CryptoAlgorithmParametersDeprecated> JSCryptoAlgorithmDictionary::createParametersForExportKey(ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSValue)
  {
      switch (algorithm) {
      case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5:
@@ -666,7 +666,7 @@ RefPtr<CryptoAlgorithmParameters> JSCryptoAlgorithmDictionary::createParametersF
      case CryptoAlgorithmIdentifier::AES_KW:
      case CryptoAlgorithmIdentifier::HMAC:
      case CryptoAlgorithmIdentifier::DH:
-        return adoptRef(*new CryptoAlgorithmParameters);
+        return adoptRef(*new CryptoAlgorithmParametersDeprecated);
      case CryptoAlgorithmIdentifier::SHA_1:
      case CryptoAlgorithmIdentifier::SHA_224:
      case CryptoAlgorithmIdentifier::SHA_256:
diff --git a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.h b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.h

index b5facd0..38a34fd 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.h
+++ b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.h
@@ -38,22 +38,22 @@ class JSValue;
  
  namespace WebCore {
  
-class CryptoAlgorithmParameters;
+class CryptoAlgorithmParametersDeprecated;
  
  class JSCryptoAlgorithmDictionary {
  public:
      static bool getAlgorithmIdentifier(JSC::ExecState*, JSC::JSValue, CryptoAlgorithmIdentifier&);
  
-    static RefPtr<CryptoAlgorithmParameters> createParametersForEncrypt(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForDecrypt(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForSign(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForVerify(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForDigest(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForGenerateKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForDeriveKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForDeriveBits(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForImportKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
-    static RefPtr<CryptoAlgorithmParameters> createParametersForExportKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForEncrypt(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForDecrypt(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForSign(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForVerify(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForDigest(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForGenerateKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForDeriveKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForDeriveBits(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForImportKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
+    static RefPtr<CryptoAlgorithmParametersDeprecated> createParametersForExportKey(JSC::ExecState*, CryptoAlgorithmIdentifier, JSC::JSValue);
  };
  
  }
diff --git a/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp b/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp

index 4df3d49..3e1b1ed 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp
@@ -29,9 +29,9 @@
  #if ENABLE(SUBTLE_CRYPTO)
  
  #include "CryptoAlgorithm.h"
-#include "CryptoAlgorithmHmacParams.h"
+#include "CryptoAlgorithmHmacParamsDeprecated.h"
  #include "CryptoAlgorithmRegistry.h"
-#include "CryptoAlgorithmRsaKeyParamsWithHash.h"
+#include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
  #include "CryptoKey.h"
  #include "CryptoKeyAES.h"
  #include "CryptoKeyDataOctetSequence.h"
@@ -162,22 +162,22 @@ JSCryptoKeySerializationJWK::~JSCryptoKeySerializationJWK()
  {
  }
  
-static Ref<CryptoAlgorithmParameters> createHMACParameters(CryptoAlgorithmIdentifier hashFunction)
+static Ref<CryptoAlgorithmParametersDeprecated> createHMACParameters(CryptoAlgorithmIdentifier hashFunction)
  {
-    auto hmacParameters = adoptRef(*new CryptoAlgorithmHmacParams);
+    auto hmacParameters = adoptRef(*new CryptoAlgorithmHmacParamsDeprecated);
      hmacParameters->hash = hashFunction;
      return WTFMove(hmacParameters);
  }
  
-static Ref<CryptoAlgorithmParameters> createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier hashFunction)
+static Ref<CryptoAlgorithmParametersDeprecated> createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier hashFunction)
  {
-    auto rsaKeyParameters = adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHash);
+    auto rsaKeyParameters = adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHashDeprecated);
      rsaKeyParameters->hasHash = true;
      rsaKeyParameters->hash = hashFunction;
      return WTFMove(rsaKeyParameters);
  }
  
-Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(CryptoAlgorithm* suggestedAlgorithm, CryptoAlgorithmParameters* suggestedParameters) const
+Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(CryptoAlgorithm* suggestedAlgorithm, CryptoAlgorithmParametersDeprecated* suggestedParameters) const
  {
      VM& vm = m_exec->vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -189,7 +189,7 @@ Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(Cr
  
      auto& algorithmRegisty = CryptoAlgorithmRegistry::singleton();
      RefPtr<CryptoAlgorithm> algorithm;
-    RefPtr<CryptoAlgorithmParameters> parameters;
+    RefPtr<CryptoAlgorithmParametersDeprecated> parameters;
      if (m_jwkAlgorithmName == "HS256") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::HMAC);
          parameters = createHMACParameters(CryptoAlgorithmIdentifier::SHA_256);
@@ -210,28 +210,28 @@ Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(Cr
          parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_512);
      } else if (m_jwkAlgorithmName == "RSA1_5") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5);
-        parameters = adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHash);
+        parameters = adoptRef(*new CryptoAlgorithmRsaKeyParamsWithHashDeprecated);
      } else if (m_jwkAlgorithmName == "RSA-OAEP") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::RSA_OAEP);
          parameters = createRSAKeyParametersWithHash(CryptoAlgorithmIdentifier::SHA_1);
      } else if (m_jwkAlgorithmName == "A128CBC") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else if (m_jwkAlgorithmName == "A192CBC") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else if (m_jwkAlgorithmName == "A256CBC") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_CBC);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else if (m_jwkAlgorithmName == "A128KW") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else if (m_jwkAlgorithmName == "A192KW") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else if (m_jwkAlgorithmName == "A256KW") {
          algorithm = algorithmRegisty.create(CryptoAlgorithmIdentifier::AES_KW);
-        parameters = adoptRef(*new CryptoAlgorithmParameters);
+        parameters = adoptRef(*new CryptoAlgorithmParametersDeprecated);
      } else {
          throwTypeError(m_exec, scope, "Unsupported JWK algorithm " + m_jwkAlgorithmName);
          return Nullopt;
@@ -247,14 +247,14 @@ Optional<CryptoAlgorithmPair> JSCryptoKeySerializationJWK::reconcileAlgorithm(Cr
          return Nullopt;
  
      if (algorithm->identifier() == CryptoAlgorithmIdentifier::HMAC) {
-        if (downcast<CryptoAlgorithmHmacParams>(*parameters).hash != downcast<CryptoAlgorithmHmacParams>(*suggestedParameters).hash)
+        if (downcast<CryptoAlgorithmHmacParamsDeprecated>(*parameters).hash != downcast<CryptoAlgorithmHmacParamsDeprecated>(*suggestedParameters).hash)
              return Nullopt;
          return CryptoAlgorithmPair { suggestedAlgorithm, suggestedParameters };
      }
      if (algorithm->identifier() == CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5
          || algorithm->identifier() == CryptoAlgorithmIdentifier::RSA_OAEP) {
-        CryptoAlgorithmRsaKeyParamsWithHash& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHash>(*parameters);
-        CryptoAlgorithmRsaKeyParamsWithHash& suggestedRSAKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHash>(*suggestedParameters);
+        CryptoAlgorithmRsaKeyParamsWithHashDeprecated& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(*parameters);
+        CryptoAlgorithmRsaKeyParamsWithHashDeprecated& suggestedRSAKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(*suggestedParameters);
          ASSERT(rsaKeyParameters.hasHash);
          if (suggestedRSAKeyParameters.hasHash) {
              if (suggestedRSAKeyParameters.hash != rsaKeyParameters.hash)
diff --git a/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h b/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h

index 969ee0d..3b71e92 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h
+++ b/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h
@@ -39,7 +39,7 @@ class JSObject;
  
  namespace WebCore {
  
-class CryptoAlgorithmParameters;
+class CryptoAlgorithmParametersDeprecated;
  class CryptoKey;
  class CryptoKeyDataRSAComponents;
  
@@ -52,7 +52,7 @@ public:
      static String serialize(JSC::ExecState* exec, const CryptoKey&);
  
  private:
-    Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParameters*) const override;
+    Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
  
      void reconcileUsages(CryptoKeyUsage&) const override;
      void reconcileExtractable(bool&) const override;
diff --git a/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp b/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp

index d4eb7c6..7d80a86 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(SUBTLE_CRYPTO)
  
  #include "CryptoAlgorithm.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  #include "CryptoAlgorithmRegistry.h"
  #include "CryptoKeyData.h"
  #include "CryptoKeySerializationRaw.h"
@@ -454,7 +454,7 @@ JSValue JSWebKitSubtleCrypto::generateKey(ExecState& state)
      return promise;
  }
  
-static void importKey(ExecState& state, CryptoKeyFormat keyFormat, CryptoOperationData data, RefPtr<CryptoAlgorithm> algorithm, RefPtr<CryptoAlgorithmParameters> parameters, bool extractable, CryptoKeyUsage keyUsages, CryptoAlgorithm::KeyCallback callback, CryptoAlgorithm::VoidCallback failureCallback)
+static void importKey(ExecState& state, CryptoKeyFormat keyFormat, CryptoOperationData data, RefPtr<CryptoAlgorithm> algorithm, RefPtr<CryptoAlgorithmParametersDeprecated> parameters, bool extractable, CryptoKeyUsage keyUsages, CryptoAlgorithm::KeyCallback callback, CryptoAlgorithm::VoidCallback failureCallback)
  {
      VM& vm = state.vm();
      auto scope = DECLARE_THROW_SCOPE(vm);
@@ -533,7 +533,7 @@ JSValue JSWebKitSubtleCrypto::importKey(ExecState& state)
          return jsUndefined();
  
      RefPtr<CryptoAlgorithm> algorithm;
-    RefPtr<CryptoAlgorithmParameters> parameters;
+    RefPtr<CryptoAlgorithmParametersDeprecated> parameters;
      if (!state.uncheckedArgument(2).isNull()) {
          algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(2));
          ASSERT(scope.exception() || algorithm);
@@ -752,7 +752,7 @@ JSValue JSWebKitSubtleCrypto::unwrapKey(ExecState& state)
          return jsUndefined();
  
      RefPtr<CryptoAlgorithm> unwrappedKeyAlgorithm;
-    RefPtr<CryptoAlgorithmParameters> unwrappedKeyAlgorithmParameters;
+    RefPtr<CryptoAlgorithmParametersDeprecated> unwrappedKeyAlgorithmParameters;
      if (!state.uncheckedArgument(4).isNull()) {
          unwrappedKeyAlgorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(4));
          ASSERT(scope.exception() || unwrappedKeyAlgorithm);
diff --git a/Source/WebCore/crypto/CryptoAlgorithm.cpp b/Source/WebCore/crypto/CryptoAlgorithm.cpp

index 44cbb02..144e7ff 100644 (file)
--- a/Source/WebCore/crypto/CryptoAlgorithm.cpp
+++ b/Source/WebCore/crypto/CryptoAlgorithm.cpp
@@ -40,57 +40,57 @@ CryptoAlgorithm::~CryptoAlgorithm()
  {
  }
  
-void CryptoAlgorithm::encrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::decrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::sign(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::verify(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, const CryptoOperationData&, BoolCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, const CryptoOperationData&, BoolCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::generateKey(const CryptoAlgorithmParameters&, bool, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::generateKey(const CryptoAlgorithmParametersDeprecated&, bool, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::deriveKey(const CryptoAlgorithmParameters&, const CryptoKey&, CryptoAlgorithm*, bool, CryptoKeyUsage, KeyCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::deriveKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, CryptoAlgorithm*, bool, CryptoKeyUsage, KeyCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::deriveBits(const CryptoAlgorithmParameters&, const CryptoKey&, unsigned long, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::deriveBits(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, unsigned long, VectorCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool, CryptoKeyUsage, KeyCallback&&, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithm::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool, CryptoKeyUsage, KeyCallback&&, VoidCallback&&, ExceptionCode& ec)
  {
      ec = NOT_SUPPORTED_ERR;
  }
  
-void CryptoAlgorithm::encryptForWrapKey(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithm::encryptForWrapKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      encrypt(parameters, key, data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithm::decryptForUnwrapKey(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithm::decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      decrypt(parameters, key, data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
diff --git a/Source/WebCore/crypto/CryptoAlgorithm.h b/Source/WebCore/crypto/CryptoAlgorithm.h

index 8ba83b3..68cc235 100644 (file)
--- a/Source/WebCore/crypto/CryptoAlgorithm.h
+++ b/Source/WebCore/crypto/CryptoAlgorithm.h
@@ -39,7 +39,7 @@ namespace WebCore {
  
  typedef int ExceptionCode;
  
-class CryptoAlgorithmParameters;
+class CryptoAlgorithmParametersDeprecated;
  class CryptoKey;
  class CryptoKeyPair;
  class CryptoKeyData;
@@ -60,19 +60,19 @@ public:
      typedef std::function<void(const Vector<uint8_t>&)> VectorCallback;
      typedef std::function<void()> VoidCallback;
  
-    virtual void encrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void decrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void sign(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void verify(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void deriveKey(const CryptoAlgorithmParameters&, const CryptoKey& baseKey, CryptoAlgorithm* derivedKeyType, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void deriveBits(const CryptoAlgorithmParameters&, const CryptoKey& baseKey, unsigned long length, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void deriveKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& baseKey, CryptoAlgorithm* derivedKeyType, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void deriveBits(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& baseKey, unsigned long length, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  
      // These are only different from encrypt/decrypt because some algorithms may not expose encrypt/decrypt.
-    virtual void encryptForWrapKey(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    virtual void decryptForUnwrapKey(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    virtual void decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  
  protected:
      CryptoAlgorithm();
diff --git a/Source/WebCore/crypto/CryptoAlgorithmParameters.h b/Source/WebCore/crypto/CryptoAlgorithmParametersDeprecated.h

similarity index 79%

rename from Source/WebCore/crypto/CryptoAlgorithmParameters.h

rename to Source/WebCore/crypto/CryptoAlgorithmParametersDeprecated.h

index 3703e46..ad0619d 100644 (file)
--- a/Source/WebCore/crypto/CryptoAlgorithmParameters.h
+++ b/Source/WebCore/crypto/CryptoAlgorithmParametersDeprecated.h
@@ -23,8 +23,7 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmParameters_h
-#define CryptoAlgorithmParameters_h
+#pragma once
  
  #include <wtf/Noncopyable.h>
  #include <wtf/RefCounted.h>
@@ -34,11 +33,10 @@
  
  namespace WebCore {
  
-class CryptoAlgorithmParameters : public RefCounted<CryptoAlgorithmParameters> {
-    WTF_MAKE_NONCOPYABLE(CryptoAlgorithmParameters);
+class CryptoAlgorithmParametersDeprecated : public RefCounted<CryptoAlgorithmParametersDeprecated> {
  public:
-    CryptoAlgorithmParameters() { }
-    virtual ~CryptoAlgorithmParameters() { }
+    CryptoAlgorithmParametersDeprecated() { }
+    virtual ~CryptoAlgorithmParametersDeprecated() { }
  
      enum class Class {
          None,
@@ -57,9 +55,8 @@ public:
  } // namespace WebCore
  
  #define SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(ToClassName) \
-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::CryptoAlgorithm##ToClassName) \
-    static bool isType(const WebCore::CryptoAlgorithmParameters& parameters) { return parameters.parametersClass() == WebCore::CryptoAlgorithmParameters::Class::ToClassName; } \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::CryptoAlgorithm##ToClassName##Deprecated) \
+    static bool isType(const WebCore::CryptoAlgorithmParametersDeprecated& parameters) { return parameters.parametersClass() == WebCore::CryptoAlgorithmParametersDeprecated::Class::ToClassName; } \
  SPECIALIZE_TYPE_TRAITS_END()
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmParameters_h
diff --git a/Source/WebCore/crypto/CryptoKeySerialization.h b/Source/WebCore/crypto/CryptoKeySerialization.h

index ad06402..b512d49 100644 (file)
--- a/Source/WebCore/crypto/CryptoKeySerialization.h
+++ b/Source/WebCore/crypto/CryptoKeySerialization.h
@@ -36,14 +36,14 @@
  namespace WebCore {
  
  class CryptoAlgorithm;
-class CryptoAlgorithmParameters;
+class CryptoAlgorithmParametersDeprecated;
  class CryptoKeyData;
  
  typedef std::pair<const uint8_t*, size_t> CryptoOperationData;
  
  struct CryptoAlgorithmPair {
      RefPtr<CryptoAlgorithm> algorithm;
-    RefPtr<CryptoAlgorithmParameters> parameters;
+    RefPtr<CryptoAlgorithmParametersDeprecated> parameters;
  };
  
  class CryptoKeySerialization {
@@ -53,7 +53,7 @@ public:
      virtual ~CryptoKeySerialization() { }
  
      // Returns false if suggested algorithm was not compatible with one stored in the serialization.
-    virtual Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParameters*) const = 0;
+    virtual Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const = 0;
  
      virtual void reconcileUsages(CryptoKeyUsage&) const = 0;
      virtual void reconcileExtractable(bool&) const = 0;
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp

index 0890863..8f419dc 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
@@ -28,8 +28,8 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmAesCbcParams.h"
-#include "CryptoAlgorithmAesKeyGenParams.h"
+#include "CryptoAlgorithmAesCbcParamsDeprecated.h"
+#include "CryptoAlgorithmAesKeyGenParamsDeprecated.h"
  #include "CryptoKeyAES.h"
  #include "CryptoKeyDataOctetSequence.h"
  #include "ExceptionCode.h"
@@ -56,7 +56,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmAES_CBC::identifier() const
      return s_identifier;
  }
  
-bool CryptoAlgorithmAES_CBC::keyAlgorithmMatches(const CryptoAlgorithmAesCbcParams&, const CryptoKey& key) const
+bool CryptoAlgorithmAES_CBC::keyAlgorithmMatches(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKey& key) const
  {
      if (key.algorithmIdentifier() != s_identifier)
          return false;
@@ -65,9 +65,9 @@ bool CryptoAlgorithmAES_CBC::keyAlgorithmMatches(const CryptoAlgorithmAesCbcPara
      return true;
  }
  
-void CryptoAlgorithmAES_CBC::encrypt(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_CBC::encrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmAesCbcParams& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParams>(parameters);
+    const CryptoAlgorithmAesCbcParamsDeprecated& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(aesCBCParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -77,9 +77,9 @@ void CryptoAlgorithmAES_CBC::encrypt(const CryptoAlgorithmParameters& parameters
      platformEncrypt(aesCBCParameters, downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmAES_CBC::decrypt(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_CBC::decrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmAesCbcParams& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParams>(parameters);
+    const CryptoAlgorithmAesCbcParamsDeprecated& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(aesCBCParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -89,9 +89,9 @@ void CryptoAlgorithmAES_CBC::decrypt(const CryptoAlgorithmParameters& parameters
      platformDecrypt(aesCBCParameters, downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmAES_CBC::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmAES_CBC::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmAesKeyGenParams& aesParameters = downcast<CryptoAlgorithmAesKeyGenParams>(parameters);
+    const CryptoAlgorithmAesKeyGenParamsDeprecated& aesParameters = downcast<CryptoAlgorithmAesKeyGenParamsDeprecated>(parameters);
  
      RefPtr<CryptoKeyAES> result = CryptoKeyAES::generate(CryptoAlgorithmIdentifier::AES_CBC, aesParameters.length, extractable, usages);
      if (!result) {
@@ -102,7 +102,7 @@ void CryptoAlgorithmAES_CBC::generateKey(const CryptoAlgorithmParameters& parame
      callback(result.get(), nullptr);
  }
  
-void CryptoAlgorithmAES_CBC::importKey(const CryptoAlgorithmParameters&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithmAES_CBC::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
  {
      if (!is<CryptoKeyDataOctetSequence>(keyData)) {
          ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h

index a61ba3a..69cecca 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h
@@ -32,7 +32,7 @@
  
  namespace WebCore {
  
-class CryptoAlgorithmAesCbcParams;
+class CryptoAlgorithmAesCbcParamsDeprecated;
  class CryptoKeyAES;
  
  class CryptoAlgorithmAES_CBC final : public CryptoAlgorithm {
@@ -44,18 +44,18 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void encrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void decrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmAES_CBC();
      virtual ~CryptoAlgorithmAES_CBC();
  
-    bool keyAlgorithmMatches(const CryptoAlgorithmAesCbcParams& algorithmParameters, const CryptoKey&) const;
-    void platformEncrypt(const CryptoAlgorithmAesCbcParams&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    void platformDecrypt(const CryptoAlgorithmAesCbcParams&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    bool keyAlgorithmMatches(const CryptoAlgorithmAesCbcParamsDeprecated& algorithmParameters, const CryptoKey&) const;
+    void platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    void platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  };
  
  }
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp

index c177443..cee57c5 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp
@@ -28,7 +28,7 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmAesKeyGenParams.h"
+#include "CryptoAlgorithmAesKeyGenParamsDeprecated.h"
  #include "CryptoKeyAES.h"
  #include "CryptoKeyDataOctetSequence.h"
  #include "ExceptionCode.h"
@@ -64,7 +64,7 @@ bool CryptoAlgorithmAES_KW::keyAlgorithmMatches(const CryptoKey& key) const
      return true;
  }
  
-void CryptoAlgorithmAES_KW::encryptForWrapKey(const CryptoAlgorithmParameters&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_KW::encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      if (!keyAlgorithmMatches(key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -74,7 +74,7 @@ void CryptoAlgorithmAES_KW::encryptForWrapKey(const CryptoAlgorithmParameters&,
      platformEncrypt(downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmAES_KW::decryptForUnwrapKey(const CryptoAlgorithmParameters&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_KW::decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      if (!keyAlgorithmMatches(key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -84,9 +84,9 @@ void CryptoAlgorithmAES_KW::decryptForUnwrapKey(const CryptoAlgorithmParameters&
      platformDecrypt(downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmAES_KW::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmAES_KW::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmAesKeyGenParams& aesParameters = downcast<CryptoAlgorithmAesKeyGenParams>(parameters);
+    const CryptoAlgorithmAesKeyGenParamsDeprecated& aesParameters = downcast<CryptoAlgorithmAesKeyGenParamsDeprecated>(parameters);
  
      RefPtr<CryptoKeyAES> result = CryptoKeyAES::generate(CryptoAlgorithmIdentifier::AES_KW, aesParameters.length, extractable, usages);
      if (!result) {
@@ -97,7 +97,7 @@ void CryptoAlgorithmAES_KW::generateKey(const CryptoAlgorithmParameters& paramet
      callback(result.get(), nullptr);
  }
  
-void CryptoAlgorithmAES_KW::importKey(const CryptoAlgorithmParameters&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithmAES_KW::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
  {
      if (!is<CryptoKeyDataOctetSequence>(keyData)) {
          ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h

index 5143cb9..76576b7 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h
@@ -43,10 +43,10 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void encryptForWrapKey(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void decryptForUnwrapKey(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmAES_KW();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp

index 96d9da3..704275f 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp
@@ -28,8 +28,8 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmHmacKeyParams.h"
-#include "CryptoAlgorithmHmacParams.h"
+#include "CryptoAlgorithmHmacKeyParamsDeprecated.h"
+#include "CryptoAlgorithmHmacParamsDeprecated.h"
  #include "CryptoKeyDataOctetSequence.h"
  #include "CryptoKeyHMAC.h"
  #include "ExceptionCode.h"
@@ -56,7 +56,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmHMAC::identifier() const
      return s_identifier;
  }
  
-bool CryptoAlgorithmHMAC::keyAlgorithmMatches(const CryptoAlgorithmHmacParams& parameters, const CryptoKey& key) const
+bool CryptoAlgorithmHMAC::keyAlgorithmMatches(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKey& key) const
  {
      if (key.algorithmIdentifier() != s_identifier)
          return false;
@@ -67,9 +67,9 @@ bool CryptoAlgorithmHMAC::keyAlgorithmMatches(const CryptoAlgorithmHmacParams& p
      return true;
  }
  
-void CryptoAlgorithmHMAC::sign(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::sign(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmHmacParams& hmacParameters = downcast<CryptoAlgorithmHmacParams>(parameters);
+    const CryptoAlgorithmHmacParamsDeprecated& hmacParameters = downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(hmacParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -79,9 +79,9 @@ void CryptoAlgorithmHMAC::sign(const CryptoAlgorithmParameters& parameters, cons
      platformSign(hmacParameters, downcast<CryptoKeyHMAC>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmHMAC::verify(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::verify(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmHmacParams& hmacParameters = downcast<CryptoAlgorithmHmacParams>(parameters);
+    const CryptoAlgorithmHmacParamsDeprecated& hmacParameters = downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(hmacParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -91,9 +91,9 @@ void CryptoAlgorithmHMAC::verify(const CryptoAlgorithmParameters& parameters, co
      platformVerify(hmacParameters, downcast<CryptoKeyHMAC>(key), expectedSignature, data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmHMAC::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmHMAC::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmHmacKeyParams& hmacParameters = downcast<CryptoAlgorithmHmacKeyParams>(parameters);
+    const CryptoAlgorithmHmacKeyParamsDeprecated& hmacParameters = downcast<CryptoAlgorithmHmacKeyParamsDeprecated>(parameters);
  
      RefPtr<CryptoKeyHMAC> result = CryptoKeyHMAC::generate(hmacParameters.hasLength ? hmacParameters.length : 0, hmacParameters.hash, extractable, usages);
      if (!result) {
@@ -104,7 +104,7 @@ void CryptoAlgorithmHMAC::generateKey(const CryptoAlgorithmParameters& parameter
      callback(result.get(), nullptr);
  }
  
-void CryptoAlgorithmHMAC::importKey(const CryptoAlgorithmParameters& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&&, ExceptionCode& ec)
  {
      if (!is<CryptoKeyDataOctetSequence>(keyData)) {
          ec = NOT_SUPPORTED_ERR;
@@ -112,7 +112,7 @@ void CryptoAlgorithmHMAC::importKey(const CryptoAlgorithmParameters& parameters,
      }
      const CryptoKeyDataOctetSequence& keyDataOctetSequence = downcast<CryptoKeyDataOctetSequence>(keyData);
  
-    const CryptoAlgorithmHmacParams& hmacParameters = downcast<CryptoAlgorithmHmacParams>(parameters);
+    const CryptoAlgorithmHmacParamsDeprecated& hmacParameters = downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters);
  
      RefPtr<CryptoKeyHMAC> result = CryptoKeyHMAC::create(keyDataOctetSequence.octetSequence(), hmacParameters.hash, extractable, usage);
      callback(*result);
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h

index 3175460..5b67e2d 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h
@@ -32,7 +32,7 @@
  
  namespace WebCore {
  
-class CryptoAlgorithmHmacParams;
+class CryptoAlgorithmHmacParamsDeprecated;
  class CryptoKeyHMAC;
  
  class CryptoAlgorithmHMAC final : public CryptoAlgorithm {
@@ -44,18 +44,18 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void sign(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void verify(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmHMAC();
      virtual ~CryptoAlgorithmHMAC();
  
-    bool keyAlgorithmMatches(const CryptoAlgorithmHmacParams& algorithmParameters, const CryptoKey&) const;
-    void platformSign(const CryptoAlgorithmHmacParams&, const CryptoKeyHMAC&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    void platformVerify(const CryptoAlgorithmHmacParams&, const CryptoKeyHMAC&, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    bool keyAlgorithmMatches(const CryptoAlgorithmHmacParamsDeprecated& algorithmParameters, const CryptoKey&) const;
+    void platformSign(const CryptoAlgorithmHmacParamsDeprecated&, const CryptoKeyHMAC&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    void platformVerify(const CryptoAlgorithmHmacParamsDeprecated&, const CryptoKeyHMAC&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  };
  
  }
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp

index fefaa35..db5be46 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
@@ -28,8 +28,8 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmRsaKeyGenParams.h"
-#include "CryptoAlgorithmRsaKeyParamsWithHash.h"
+#include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
+#include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
  #include "CryptoKeyDataRSAComponents.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
@@ -65,7 +65,7 @@ bool CryptoAlgorithmRSAES_PKCS1_v1_5::keyAlgorithmMatches(const CryptoKey& key)
      return true;
  }
  
-void CryptoAlgorithmRSAES_PKCS1_v1_5::encrypt(const CryptoAlgorithmParameters&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSAES_PKCS1_v1_5::encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      if (!keyAlgorithmMatches(key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -75,7 +75,7 @@ void CryptoAlgorithmRSAES_PKCS1_v1_5::encrypt(const CryptoAlgorithmParameters&,
      platformEncrypt(downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSAES_PKCS1_v1_5::decrypt(const CryptoAlgorithmParameters&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSAES_PKCS1_v1_5::decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      if (!keyAlgorithmMatches(key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -85,9 +85,9 @@ void CryptoAlgorithmRSAES_PKCS1_v1_5::decrypt(const CryptoAlgorithmParameters&,
      platformDecrypt(downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSAES_PKCS1_v1_5::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSAES_PKCS1_v1_5::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyGenParams& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParams>(parameters);
+    const CryptoAlgorithmRsaKeyGenParamsDeprecated& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
  
      auto keyPairCallback = [callback](CryptoKeyPair& pair) {
          callback(nullptr, &pair);
@@ -96,9 +96,9 @@ void CryptoAlgorithmRSAES_PKCS1_v1_5::generateKey(const CryptoAlgorithmParameter
      CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback));
  }
  
-void CryptoAlgorithmRSAES_PKCS1_v1_5::importKey(const CryptoAlgorithmParameters& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSAES_PKCS1_v1_5::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyParamsWithHash& rsaParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHash>(parameters);
+    const CryptoAlgorithmRsaKeyParamsWithHashDeprecated& rsaParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
      const CryptoKeyDataRSAComponents& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
  
      RefPtr<CryptoKeyRSA> result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaComponents, extractable, usage);
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h

index e1d8e33..8ea3b73 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h
@@ -44,10 +44,10 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void encrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void decrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmRSAES_PKCS1_v1_5();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp

index ab156cf..b3f862e 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
@@ -28,9 +28,9 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmRsaKeyGenParams.h"
-#include "CryptoAlgorithmRsaKeyParamsWithHash.h"
-#include "CryptoAlgorithmRsaSsaParams.h"
+#include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
+#include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
+#include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
  #include "CryptoKeyDataRSAComponents.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
@@ -57,7 +57,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmRSASSA_PKCS1_v1_5::identifier() const
      return s_identifier;
  }
  
-bool CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParams& algorithmParameters, const CryptoKey& key) const
+bool CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParamsDeprecated& algorithmParameters, const CryptoKey& key) const
  {
      if (key.algorithmIdentifier() != s_identifier)
          return false;
@@ -69,9 +69,9 @@ bool CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches(const CryptoAlgorithm
      return true;
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::sign(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::sign(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmRsaSsaParams& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParams>(parameters);
+    const CryptoAlgorithmRsaSsaParamsDeprecated& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(rsaSSAParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -81,9 +81,9 @@ void CryptoAlgorithmRSASSA_PKCS1_v1_5::sign(const CryptoAlgorithmParameters& par
      platformSign(rsaSSAParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::verify(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::verify(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmRsaSsaParams& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParams>(parameters);
+    const CryptoAlgorithmRsaSsaParamsDeprecated& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(rsaSSAParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -93,9 +93,9 @@ void CryptoAlgorithmRSASSA_PKCS1_v1_5::verify(const CryptoAlgorithmParameters& p
      platformVerify(rsaSSAParameters,  downcast<CryptoKeyRSA>(key), signature, data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyGenParams& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParams>(parameters);
+    const CryptoAlgorithmRsaKeyGenParamsDeprecated& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
  
      auto keyPairCallback = [callback](CryptoKeyPair& pair) {
          callback(nullptr, &pair);
@@ -104,9 +104,9 @@ void CryptoAlgorithmRSASSA_PKCS1_v1_5::generateKey(const CryptoAlgorithmParamete
      CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback));
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::importKey(const CryptoAlgorithmParameters& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyParamsWithHash& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHash>(parameters);
+    const CryptoAlgorithmRsaKeyParamsWithHashDeprecated& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
      const CryptoKeyDataRSAComponents& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
  
      RefPtr<CryptoKeyRSA> result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5, rsaKeyParameters.hash, rsaKeyParameters.hasHash, rsaComponents, extractable, usage);
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h

index dc2bfd6..d06f76b 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h
@@ -32,7 +32,7 @@
  
  namespace WebCore {
  
-class CryptoAlgorithmRsaSsaParams;
+class CryptoAlgorithmRsaSsaParamsDeprecated;
  class CryptoKeyRSA;
  
  class CryptoAlgorithmRSASSA_PKCS1_v1_5 final : public CryptoAlgorithm {
@@ -44,18 +44,18 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void sign(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void verify(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmRSASSA_PKCS1_v1_5();
      virtual ~CryptoAlgorithmRSASSA_PKCS1_v1_5();
  
-    bool keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParams& algorithmParameters, const CryptoKey&) const;
-    void platformSign(const CryptoAlgorithmRsaSsaParams&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    void platformVerify(const CryptoAlgorithmRsaSsaParams&, const CryptoKeyRSA&, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    bool keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParamsDeprecated& algorithmParameters, const CryptoKey&) const;
+    void platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    void platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  };
  
  }
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp

index 5b0994d..225591c 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
@@ -28,9 +28,9 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmRsaKeyGenParams.h"
-#include "CryptoAlgorithmRsaKeyParamsWithHash.h"
-#include "CryptoAlgorithmRsaOaepParams.h"
+#include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
+#include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
+#include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
  #include "CryptoKeyDataRSAComponents.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
@@ -57,7 +57,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmRSA_OAEP::identifier() const
      return s_identifier;
  }
  
-bool CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParams& algorithmParameters, const CryptoKey& key) const
+bool CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParamsDeprecated& algorithmParameters, const CryptoKey& key) const
  {
      if (key.algorithmIdentifier() != s_identifier)
          return false;
@@ -69,9 +69,9 @@ bool CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches(const CryptoAlgorithmRsaOaepPa
      return true;
  }
  
-void CryptoAlgorithmRSA_OAEP::encrypt(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::encrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmRsaOaepParams& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParams>(parameters);
+    const CryptoAlgorithmRsaOaepParamsDeprecated& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(rsaOAEPParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -81,9 +81,9 @@ void CryptoAlgorithmRSA_OAEP::encrypt(const CryptoAlgorithmParameters& parameter
      platformEncrypt(rsaOAEPParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSA_OAEP::decrypt(const CryptoAlgorithmParameters& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::decrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
-    const CryptoAlgorithmRsaOaepParams& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParams>(parameters);
+    const CryptoAlgorithmRsaOaepParamsDeprecated& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParamsDeprecated>(parameters);
  
      if (!keyAlgorithmMatches(rsaOAEPParameters, key)) {
          ec = NOT_SUPPORTED_ERR;
@@ -93,9 +93,9 @@ void CryptoAlgorithmRSA_OAEP::decrypt(const CryptoAlgorithmParameters& parameter
      platformDecrypt(rsaOAEPParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback), ec);
  }
  
-void CryptoAlgorithmRSA_OAEP::generateKey(const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSA_OAEP::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsage usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyGenParams& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParams>(parameters);
+    const CryptoAlgorithmRsaKeyGenParamsDeprecated& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
  
      auto keyPairCallback = [callback](CryptoKeyPair& pair) {
          callback(nullptr, &pair);
@@ -104,9 +104,9 @@ void CryptoAlgorithmRSA_OAEP::generateKey(const CryptoAlgorithmParameters& param
      CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSA_OAEP, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback));
  }
  
-void CryptoAlgorithmRSA_OAEP::importKey(const CryptoAlgorithmParameters& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmRSA_OAEP::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsage usage, KeyCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
-    const CryptoAlgorithmRsaKeyParamsWithHash& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHash>(parameters);
+    const CryptoAlgorithmRsaKeyParamsWithHashDeprecated& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
      const CryptoKeyDataRSAComponents& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
  
      RefPtr<CryptoKeyRSA> result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSA_OAEP, rsaKeyParameters.hash, rsaKeyParameters.hasHash, rsaComponents, extractable, usage);
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h

index 840be0b..0eb6996 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h
@@ -32,7 +32,7 @@
  
  namespace WebCore {
  
-class CryptoAlgorithmRsaOaepParams;
+class CryptoAlgorithmRsaOaepParamsDeprecated;
  class CryptoKeyRSA;
  
  class CryptoAlgorithmRSA_OAEP final : public CryptoAlgorithm {
@@ -44,18 +44,18 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void encrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void decrypt(const CryptoAlgorithmParameters&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void generateKey(const CryptoAlgorithmParameters&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
-    void importKey(const CryptoAlgorithmParameters&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsage, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsage, KeyCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmRSA_OAEP();
      virtual ~CryptoAlgorithmRSA_OAEP();
  
-    bool keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParams& algorithmParameters, const CryptoKey&) const;
-    void platformEncrypt(const CryptoAlgorithmRsaOaepParams&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
-    void platformDecrypt(const CryptoAlgorithmRsaOaepParams&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    bool keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParamsDeprecated& algorithmParameters, const CryptoKey&) const;
+    void platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
+    void platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&);
  };
  
  }
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp

index 578b66b..729796d 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp
@@ -52,7 +52,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmSHA1::identifier() const
      return s_identifier;
  }
  
-void CryptoAlgorithmSHA1::digest(const CryptoAlgorithmParameters&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmSHA1::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      std::unique_ptr<CryptoDigest> digest = CryptoDigest::create(CryptoDigest::Algorithm::SHA_1);
      if (!digest) {
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h

index 8292437..f5240b2 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h
@@ -41,7 +41,7 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmSHA1();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp

index 30d2b13..fa80fc6 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp
@@ -52,7 +52,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmSHA224::identifier() const
      return s_identifier;
  }
  
-void CryptoAlgorithmSHA224::digest(const CryptoAlgorithmParameters&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmSHA224::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      std::unique_ptr<CryptoDigest> digest = CryptoDigest::create(CryptoDigest::Algorithm::SHA_224);
      if (!digest) {
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h

index a4f4308..dff6d21 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h
@@ -41,7 +41,7 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmSHA224();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp

index eb2ada2..32499a9 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp
@@ -52,7 +52,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmSHA256::identifier() const
      return s_identifier;
  }
  
-void CryptoAlgorithmSHA256::digest(const CryptoAlgorithmParameters&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmSHA256::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      std::unique_ptr<CryptoDigest> digest = CryptoDigest::create(CryptoDigest::Algorithm::SHA_256);
      if (!digest) {
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h

index 41d0779..7dd758a 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h
@@ -41,7 +41,7 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmSHA256();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp

index d7d4102..34ed87c 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp
@@ -52,7 +52,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmSHA384::identifier() const
      return s_identifier;
  }
  
-void CryptoAlgorithmSHA384::digest(const CryptoAlgorithmParameters&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmSHA384::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      std::unique_ptr<CryptoDigest> digest = CryptoDigest::create(CryptoDigest::Algorithm::SHA_384);
      if (!digest) {
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h

index 8327003..b0b0d0e 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h
@@ -41,7 +41,7 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmSHA384();
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp

index 161bf73..9da9736 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp
@@ -52,7 +52,7 @@ CryptoAlgorithmIdentifier CryptoAlgorithmSHA512::identifier() const
      return s_identifier;
  }
  
-void CryptoAlgorithmSHA512::digest(const CryptoAlgorithmParameters&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmSHA512::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      std::unique_ptr<CryptoDigest> digest = CryptoDigest::create(CryptoDigest::Algorithm::SHA_512);
      if (!digest) {
diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h

index f316183..6402a29 100644 (file)
--- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h
+++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h
@@ -41,7 +41,7 @@ public:
  
      CryptoAlgorithmIdentifier identifier() const override;
  
-    void digest(const CryptoAlgorithmParameters&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
+    void digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback, ExceptionCode&) override;
  
  private:
      CryptoAlgorithmSHA512();
diff --git a/Source/WebCore/crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp b/Source/WebCore/crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp

index 548a3ec..14607db 100644 (file)
--- a/Source/WebCore/crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp
+++ b/Source/WebCore/crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp
@@ -28,14 +28,14 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmAesCbcParams.h"
+#include "CryptoAlgorithmAesCbcParamsDeprecated.h"
  #include "CryptoKeyAES.h"
  #include "ExceptionCode.h"
  #include "NotImplemented.h"
  
  namespace WebCore {
  
-void CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParams& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
@@ -47,7 +47,7 @@ void CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParams&
      UNUSED_PARAM(failureCallback);
  }
  
-void CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParams& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp b/Source/WebCore/crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp

index ba91311..a830465 100644 (file)
--- a/Source/WebCore/crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp
+++ b/Source/WebCore/crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp
@@ -28,7 +28,7 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmHmacParams.h"
+#include "CryptoAlgorithmHmacParamsDeprecated.h"
  #include "CryptoKeyHMAC.h"
  #include "ExceptionCode.h"
  #include <gnutls/gnutls.h>
@@ -68,7 +68,7 @@ static Vector<uint8_t> calculateSignature(gnutls_mac_algorithm_t algorithm, cons
      return result;
  }
  
-void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      UNUSED_PARAM(failureCallback);
      gnutls_mac_algorithm_t algorithm = getGnutlsDigestAlgorithm(parameters.hash);
@@ -82,7 +82,7 @@ void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& paramete
      callback(signature);
  }
  
-void CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      UNUSED_PARAM(failureCallback);
      gnutls_mac_algorithm_t algorithm = getGnutlsDigestAlgorithm(parameters.hash);
diff --git a/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp b/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp

index cf5667f..568d52b 100644 (file)
--- a/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
+++ b/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
@@ -28,14 +28,14 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmRsaSsaParams.h"
+#include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
  #include "NotImplemented.h"
  
  namespace WebCore {
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
@@ -47,7 +47,7 @@ void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaP
      UNUSED_PARAM(failureCallback);
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp b/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp

index 3024bec..ab06acd 100644 (file)
--- a/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
+++ b/Source/WebCore/crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
@@ -28,14 +28,14 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmRsaOaepParams.h"
+#include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
  #include "NotImplemented.h"
  
  namespace WebCore {
  
-void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
@@ -47,7 +47,7 @@ void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParams
      UNUSED_PARAM(failureCallback);
  }
  
-void CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      notImplemented();
      ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp b/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp

index ff08730..6d3b8c8 100644 (file)
--- a/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp
+++ b/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(SUBTLE_CRYPTO)
  
  #include "CryptoAlgorithm.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  #include "CryptoKey.h"
  #include "CryptoKeyDataOctetSequence.h"
  
@@ -44,7 +44,7 @@ CryptoKeySerializationRaw::~CryptoKeySerializationRaw()
  {
  }
  
-Optional<CryptoAlgorithmPair> CryptoKeySerializationRaw::reconcileAlgorithm(CryptoAlgorithm* algorithm, CryptoAlgorithmParameters* parameters) const
+Optional<CryptoAlgorithmPair> CryptoKeySerializationRaw::reconcileAlgorithm(CryptoAlgorithm* algorithm, CryptoAlgorithmParametersDeprecated* parameters) const
  {
      return CryptoAlgorithmPair { algorithm, parameters };
  }
diff --git a/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h b/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h

index 08ead82..efa3cd2 100644 (file)
--- a/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h
+++ b/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h
@@ -51,7 +51,7 @@ public:
  private:
      CryptoKeySerializationRaw(const CryptoOperationData&);
  
-    Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParameters*) const override;
+    Optional<CryptoAlgorithmPair> reconcileAlgorithm(CryptoAlgorithm*, CryptoAlgorithmParametersDeprecated*) const override;
  
      void reconcileUsages(CryptoKeyUsage&) const override;
      void reconcileExtractable(bool&) const override;
diff --git a/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp b/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp

index 1586907..b123cec 100644 (file)
--- a/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp
+++ b/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp
@@ -28,14 +28,14 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmAesCbcParams.h"
+#include "CryptoAlgorithmAesCbcParamsDeprecated.h"
  #include "CryptoKeyAES.h"
  #include "ExceptionCode.h"
  #include <CommonCrypto/CommonCrypto.h>
  
  namespace WebCore {
  
-static void transformAES_CBC(CCOperation operation, const CryptoAlgorithmAesCbcParams& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, CryptoAlgorithm::VectorCallback&& callback, CryptoAlgorithm::VoidCallback&& failureCallback)
+static void transformAES_CBC(CCOperation operation, const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, CryptoAlgorithm::VectorCallback&& callback, CryptoAlgorithm::VoidCallback&& failureCallback)
  {
      static_assert(sizeof(parameters.iv) == kCCBlockSizeAES128, "Initialization vector size must be the same as algorithm block size");
  
@@ -82,12 +82,12 @@ static void transformAES_CBC(CCOperation operation, const CryptoAlgorithmAesCbcP
      callback(result);
  }
  
-void CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParams& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      transformAES_CBC(kCCEncrypt, parameters, key, data, WTFMove(callback), WTFMove(failureCallback));
  }
  
-void CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParams& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
+void CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode&)
  {
      transformAES_CBC(kCCDecrypt, parameters, key, data, WTFMove(callback), WTFMove(failureCallback));
  }
diff --git a/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp b/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp

index cf3a460..296a78a 100644 (file)
--- a/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp
+++ b/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp
@@ -28,7 +28,7 @@
  
  #if ENABLE(SUBTLE_CRYPTO)
  
-#include "CryptoAlgorithmHmacParams.h"
+#include "CryptoAlgorithmHmacParamsDeprecated.h"
  #include "CryptoKeyHMAC.h"
  #include "ExceptionCode.h"
  #include <CommonCrypto/CommonHMAC.h>
@@ -89,7 +89,7 @@ static Vector<uint8_t> calculateSignature(CCHmacAlgorithm algorithm, const Vecto
      return result;
  }
  
-void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&&, ExceptionCode& ec)
  {
      CCHmacAlgorithm algorithm;
      if (!getCommonCryptoHMACAlgorithm(parameters.hash, algorithm)) {
@@ -102,7 +102,7 @@ void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& paramete
      callback(signature);
  }
  
-void CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParams& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&&, ExceptionCode& ec)
+void CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&&, ExceptionCode& ec)
  {
      CCHmacAlgorithm algorithm;
      if (!getCommonCryptoHMACAlgorithm(parameters.hash, algorithm)) {
diff --git a/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp b/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp

index 39ac402..0ab8f42 100644 (file)
--- a/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp
+++ b/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp
@@ -29,7 +29,7 @@
  #if ENABLE(SUBTLE_CRYPTO)
  
  #include "CommonCryptoUtilities.h"
-#include "CryptoAlgorithmRsaSsaParams.h"
+#include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
  #include "CryptoDigest.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
@@ -59,7 +59,7 @@ inline bool getCryptoDigestAlgorithm(CryptoAlgorithmIdentifier hashFunction, Cry
      }
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      CCDigestAlgorithm digestAlgorithm;
      if (!getCommonCryptoDigestAlgorithm(parameters.hash, digestAlgorithm)) {
@@ -96,7 +96,7 @@ void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaP
      callback(signature);
  }
  
-void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      CCDigestAlgorithm digestAlgorithm;
      if (!getCommonCryptoDigestAlgorithm(parameters.hash, digestAlgorithm)) {
diff --git a/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp b/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp

index aacdfaf..cf281ca 100644 (file)
--- a/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp
+++ b/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp
@@ -29,13 +29,13 @@
  #if ENABLE(SUBTLE_CRYPTO)
  
  #include "CommonCryptoUtilities.h"
-#include "CryptoAlgorithmRsaOaepParams.h"
+#include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
  #include "CryptoKeyRSA.h"
  #include "ExceptionCode.h"
  
  namespace WebCore {
  
-void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      CCDigestAlgorithm digestAlgorithm;
      if (!getCommonCryptoDigestAlgorithm(parameters.hash, digestAlgorithm)) {
@@ -56,7 +56,7 @@ void CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParams
      callback(cipherText);
  }
  
-void CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParams& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
+void CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback, ExceptionCode& ec)
  {
      CCDigestAlgorithm digestAlgorithm;
      if (!getCommonCryptoDigestAlgorithm(parameters.hash, digestAlgorithm)) {
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h

similarity index 88%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h

index 2a798f7..8cb5e96 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h
@@ -23,17 +23,16 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmAesCbcParams_h
-#define CryptoAlgorithmAesCbcParams_h
+#pragma once
  
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  #include <array>
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmAesCbcParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmAesCbcParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
      // The initialization vector. MUST be 16 bytes.
      std::array<char, 16> iv;
@@ -46,4 +45,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(AesCbcParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmAesCbcParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h

similarity index 87%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h

index e54c5cf..5a3062d 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h
@@ -23,16 +23,15 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmAesKeyGenParams_h
-#define CryptoAlgorithmAesKeyGenParams_h
+#pragma once
  
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmAesKeyGenParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmAesKeyGenParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
      // The length, in bits, of the key.
      unsigned length;
@@ -45,4 +44,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(AesKeyGenParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmAesKeyGenParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h

similarity index 88%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h

index 921b15d..a117fc3 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h
@@ -23,19 +23,18 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmHmacKeyParams_h
-#define CryptoAlgorithmHmacKeyParams_h
+#pragma once
  
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmHmacKeyParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmHmacKeyParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
-    CryptoAlgorithmHmacKeyParams()
+    CryptoAlgorithmHmacKeyParamsDeprecated()
          : hasLength(false)
      {
      }
@@ -56,4 +55,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(HmacKeyParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmHmacKeyParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h

similarity index 88%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h

index 53793b6..1e5b1b3 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h
@@ -23,17 +23,16 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmHmacParams_h
-#define CryptoAlgorithmHmacParams_h
+#pragma once
  
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmHmacParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmHmacParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
      // The inner hash function to use.
      CryptoAlgorithmIdentifier hash;
@@ -46,4 +45,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(HmacParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmHmacParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h

similarity index 87%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h

index f63a57c..4b33f73 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h
@@ -23,19 +23,18 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmRsaKeyGenParams_h
-#define CryptoAlgorithmRsaKeyGenParams_h
+#pragma once
  
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  #include <wtf/Vector.h>
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmRsaKeyGenParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmRsaKeyGenParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
-    CryptoAlgorithmRsaKeyGenParams()
+    CryptoAlgorithmRsaKeyGenParamsDeprecated()
          : hasHash(false)
      {
      }
@@ -55,4 +54,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(RsaKeyGenParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmRsaKeyGenParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHash.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h

similarity index 87%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHash.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h

index defcaa1..ae97c8b 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHash.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h
@@ -23,11 +23,10 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmRsaKeyParamsWithHash_h
-#define CryptoAlgorithmRsaKeyParamsWithHash_h
+#pragma once
  
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
@@ -36,9 +35,9 @@ namespace WebCore {
  // This parameters class is currently not specified in WebCrypto.
  // It is necessary to support import from JWK, which treats hash function as part of algorithm
  // identifier, so we need to remember it to compare with one passed to sign or verify functions.
-class CryptoAlgorithmRsaKeyParamsWithHash final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmRsaKeyParamsWithHashDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
-    CryptoAlgorithmRsaKeyParamsWithHash()
+    CryptoAlgorithmRsaKeyParamsWithHashDeprecated()
          : hasHash(false)
      {
      }
@@ -55,4 +54,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(RsaKeyParamsWithHash)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmRsaKeyParamsWithHash_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h

similarity index 88%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h

index 0d2c34c..9980593 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h
@@ -23,19 +23,18 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmRsaOaepParams_h
-#define CryptoAlgorithmRsaOaepParams_h
+#pragma once
  
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmRsaOaepParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmRsaOaepParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
-    CryptoAlgorithmRsaOaepParams()
+    CryptoAlgorithmRsaOaepParamsDeprecated()
          : hasLabel(false)
      {
      }
@@ -56,4 +55,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(RsaOaepParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmRsaOaepParams_h
diff --git a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParams.h b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h

similarity index 88%

rename from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParams.h

rename to Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h

index 8185f8d..c394a37 100644 (file)
--- a/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParams.h
+++ b/Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h
@@ -23,17 +23,16 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef CryptoAlgorithmRsaSsaParams_h
-#define CryptoAlgorithmRsaSsaParams_h
+#pragma once
  
  #include "CryptoAlgorithmIdentifier.h"
-#include "CryptoAlgorithmParameters.h"
+#include "CryptoAlgorithmParametersDeprecated.h"
  
  #if ENABLE(SUBTLE_CRYPTO)
  
  namespace WebCore {
  
-class CryptoAlgorithmRsaSsaParams final : public CryptoAlgorithmParameters {
+class CryptoAlgorithmRsaSsaParamsDeprecated final : public CryptoAlgorithmParametersDeprecated {
  public:
      // The hash algorithm to use.
      CryptoAlgorithmIdentifier hash;
@@ -46,4 +45,3 @@ public:
  SPECIALIZE_TYPE_TRAITS_CRYPTO_ALGORITHM_PARAMETERS(RsaSsaParams)
  
  #endif // ENABLE(SUBTLE_CRYPTO)
-#endif // CryptoAlgorithmRsaSsaParams_h
author	jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)
committer	jiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 10 Oct 2016 22:07:19 +0000 (22:07 +0000)
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp		patch \| blob \| history
Source/WebCore/WebCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.h		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.h		patch \| blob \| history
Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp		patch \| blob \| history
Source/WebCore/crypto/CryptoAlgorithm.cpp		patch \| blob \| history
Source/WebCore/crypto/CryptoAlgorithm.h		patch \| blob \| history
Source/WebCore/crypto/CryptoAlgorithmParametersDeprecated.h	[moved from Source/WebCore/crypto/CryptoAlgorithmParameters.h with 79% similarity]	patch \| blob \| history
Source/WebCore/crypto/CryptoKeySerialization.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp		patch \| blob \| history
Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h		patch \| blob \| history
Source/WebCore/crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp		patch \| blob \| history
Source/WebCore/crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp		patch \| blob \| history
Source/WebCore/crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp		patch \| blob \| history
Source/WebCore/crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp		patch \| blob \| history
Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp		patch \| blob \| history
Source/WebCore/crypto/keys/CryptoKeySerializationRaw.h		patch \| blob \| history
Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp		patch \| blob \| history
Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp		patch \| blob \| history
Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp		patch \| blob \| history
Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp		patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmAesCbcParams.h with 88% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmAesKeyGenParams.h with 87% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacKeyParams.h with 88% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmHmacParams.h with 88% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyGenParams.h with 87% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHash.h with 87% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaOaepParams.h with 88% similarity]	patch \| blob \| history
Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h	[moved from Source/WebCore/crypto/parameters/CryptoAlgorithmRsaSsaParams.h with 88% similarity]	patch \| blob \| history