Changeset 220941 in webkit


Ignore:
Timestamp:
Aug 18, 2017 4:24:59 PM (7 years ago)
Author:
weinig@apple.com
Message:

Remove the deprecated WebKitSubtleCrypto interface
​https://bugs.webkit.org/show_bug.cgi?id=164938
<rdar://problem/29894563>

Reviewed by Chris Dumez.

Source/WebCore:

Remove WebKitSubtleCrypto and all of its helper classes / functionality.

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSCryptoAlgorithmDictionary.cpp: Removed.
  • bindings/js/JSCryptoAlgorithmDictionary.h: Removed.
  • bindings/js/JSCryptoKeySerializationJWK.cpp: Removed.
  • bindings/js/JSCryptoKeySerializationJWK.h: Removed.
  • bindings/js/JSCryptoOperationData.cpp: Removed.
  • bindings/js/JSCryptoOperationData.h: Removed.
  • bindings/js/JSWebKitSubtleCryptoCustom.cpp: Removed.
  • crypto/CryptoAlgorithm.cpp:

(WebCore::CryptoAlgorithm::deriveKey): Deleted.
(WebCore::CryptoAlgorithm::encryptForWrapKey): Deleted.
(WebCore::CryptoAlgorithm::decryptForUnwrapKey): Deleted.

  • crypto/CryptoAlgorithm.h:
  • crypto/CryptoAlgorithmParametersDeprecated.h: Removed.
  • crypto/CryptoKeySerialization.h: Removed.
  • crypto/WebKitSubtleCrypto.cpp: Removed.
  • crypto/WebKitSubtleCrypto.h: Removed.
  • crypto/WebKitSubtleCrypto.idl: Removed.
  • crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:

(WebCore::CryptoAlgorithmAES_CBC::keyAlgorithmMatches const): Deleted.

  • crypto/algorithms/CryptoAlgorithmAES_CBC.h:
  • crypto/algorithms/CryptoAlgorithmAES_KW.cpp:

(WebCore::CryptoAlgorithmAES_KW::encryptForWrapKey): Deleted.
(WebCore::CryptoAlgorithmAES_KW::decryptForUnwrapKey): Deleted.

  • crypto/algorithms/CryptoAlgorithmAES_KW.h:
  • crypto/algorithms/CryptoAlgorithmHMAC.cpp:

(WebCore::CryptoAlgorithmHMAC::keyAlgorithmMatches const): Deleted.

  • 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:

(WebCore::CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches const): Deleted.

  • crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h:
  • crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:

(WebCore::CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches const): Deleted.

  • 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/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp:
  • crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp:

(WebCore::CryptoAlgorithmAES_KW::platformEncrypt): Deleted.
(WebCore::CryptoAlgorithmAES_KW::platformDecrypt): Deleted.

  • crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
  • crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp:
  • crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp:
  • crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp:
  • crypto/keys/CryptoKeySerializationRaw.cpp: Removed.
  • crypto/keys/CryptoKeySerializationRaw.h: Removed.
  • crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
  • crypto/mac/CryptoAlgorithmAES_KWMac.cpp:

(WebCore::CryptoAlgorithmAES_KW::platformEncrypt): Deleted.
(WebCore::CryptoAlgorithmAES_KW::platformDecrypt): Deleted.

  • crypto/mac/CryptoAlgorithmHMACMac.cpp:
  • crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp:
  • crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
  • crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
  • crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h: Removed.
  • crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h: Removed.
  • features.json:
  • page/Crypto.cpp:
  • page/Crypto.h:
  • page/Crypto.idl:

LayoutTests:

  • crypto/webkitSubtle: Removed.
  • crypto/webkitSubtle/aes-cbc-192-encrypt-decrypt-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-192-encrypt-decrypt.html: Removed.
  • crypto/webkitSubtle/aes-cbc-256-encrypt-decrypt-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-256-encrypt-decrypt.html: Removed.
  • crypto/webkitSubtle/aes-cbc-encrypt-decrypt-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-encrypt-decrypt-with-padding.html: Removed.
  • crypto/webkitSubtle/aes-cbc-encrypt-decrypt.html: Removed.
  • crypto/webkitSubtle/aes-cbc-generate-key-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-generate-key.html: Removed.
  • crypto/webkitSubtle/aes-cbc-import-jwk-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-import-jwk.html: Removed.
  • crypto/webkitSubtle/aes-cbc-invalid-length-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-invalid-length.html: Removed.
  • crypto/webkitSubtle/aes-cbc-unwrap-failure-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-unwrap-failure.html: Removed.
  • crypto/webkitSubtle/aes-cbc-unwrap-rsa-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-unwrap-rsa.html: Removed.
  • crypto/webkitSubtle/aes-cbc-wrap-rsa-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-wrap-rsa-non-extractable-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-wrap-rsa-non-extractable.html: Removed.
  • crypto/webkitSubtle/aes-cbc-wrap-rsa.html: Removed.
  • crypto/webkitSubtle/aes-cbc-wrong-key-class-expected.txt: Removed.
  • crypto/webkitSubtle/aes-cbc-wrong-key-class.html: Removed.
  • crypto/webkitSubtle/aes-export-key-expected.txt: Removed.
  • crypto/webkitSubtle/aes-export-key.html: Removed.
  • crypto/webkitSubtle/aes-kw-key-manipulation-expected.txt: Removed.
  • crypto/webkitSubtle/aes-kw-key-manipulation.html: Removed.
  • crypto/webkitSubtle/aes-kw-wrap-unwrap-aes-expected.txt: Removed.
  • crypto/webkitSubtle/aes-kw-wrap-unwrap-aes.html: Removed.
  • crypto/webkitSubtle/aes-postMessage-expected.txt: Removed.
  • crypto/webkitSubtle/aes-postMessage.html: Removed.
  • crypto/webkitSubtle/argument-conversion-expected.txt: Removed.
  • crypto/webkitSubtle/argument-conversion.html: Removed.
  • crypto/webkitSubtle/array-buffer-view-offset-expected.txt: Removed.
  • crypto/webkitSubtle/array-buffer-view-offset.html: Removed.
  • crypto/webkitSubtle/disallowed-in-worker-expected.txt: Removed.
  • crypto/webkitSubtle/disallowed-in-worker.html: Removed.
  • crypto/webkitSubtle/gc-2-expected.txt: Removed.
  • crypto/webkitSubtle/gc-2.html: Removed.
  • crypto/webkitSubtle/gc-3-expected.txt: Removed.
  • crypto/webkitSubtle/gc-3.html: Removed.
  • crypto/webkitSubtle/gc-expected.txt: Removed.
  • crypto/webkitSubtle/gc.html: Removed.
  • crypto/webkitSubtle/hmac-check-algorithm-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-check-algorithm.html: Removed.
  • crypto/webkitSubtle/hmac-export-key-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-export-key.html: Removed.
  • crypto/webkitSubtle/hmac-generate-key-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-generate-key.html: Removed.
  • crypto/webkitSubtle/hmac-import-jwk-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-import-jwk.html: Removed.
  • crypto/webkitSubtle/hmac-postMessage-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-postMessage.html: Removed.
  • crypto/webkitSubtle/hmac-sign-verify-empty-key-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-sign-verify-empty-key.html: Removed.
  • crypto/webkitSubtle/hmac-sign-verify-expected.txt: Removed.
  • crypto/webkitSubtle/hmac-sign-verify.html: Removed.
  • crypto/webkitSubtle/import-export-raw-key-leak-expected.txt: Removed.
  • crypto/webkitSubtle/import-export-raw-key-leak.html: Removed.
  • crypto/webkitSubtle/import-jwk-expected.txt: Removed.
  • crypto/webkitSubtle/import-jwk.html: Removed.
  • crypto/webkitSubtle/jwk-export-use-values-expected.txt: Removed.
  • crypto/webkitSubtle/jwk-export-use-values.html: Removed.
  • crypto/webkitSubtle/jwk-import-use-values-expected.txt: Removed.
  • crypto/webkitSubtle/jwk-import-use-values.html: Removed.
  • crypto/webkitSubtle/resources: Removed.
  • crypto/webkitSubtle/resources/disallowed-in-worker.js: Removed.
  • crypto/webkitSubtle/resources/rsa-indexeddb-non-exportable.js: Removed.
  • crypto/webkitSubtle/resources/rsa-indexeddb.js: Removed.
  • crypto/webkitSubtle/rsa-export-generated-keys-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-export-generated-keys.html: Removed.
  • crypto/webkitSubtle/rsa-export-key-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-export-key.html: Removed.
  • crypto/webkitSubtle/rsa-export-private-key-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-export-private-key.html: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-non-exportable-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-non-exportable-private-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-non-exportable-private.html: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-non-exportable.html: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-private-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-indexeddb-private.html: Removed.
  • crypto/webkitSubtle/rsa-indexeddb.html: Removed.
  • crypto/webkitSubtle/rsa-oaep-generate-non-extractable-key-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-oaep-generate-non-extractable-key.html: Removed.
  • crypto/webkitSubtle/rsa-oaep-key-manipulation-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-oaep-key-manipulation.html: Removed.
  • crypto/webkitSubtle/rsa-oaep-plaintext-length-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-oaep-plaintext-length.html: Removed.
  • crypto/webkitSubtle/rsa-oaep-wrap-unwrap-aes-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-oaep-wrap-unwrap-aes.html: Removed.
  • crypto/webkitSubtle/rsa-postMessage-expected.txt: Removed.
  • crypto/webkitSubtle/rsa-postMessage.html: Removed.
  • crypto/webkitSubtle/rsaes-pkcs1-v1_5-decrypt-expected.txt: Removed.
  • crypto/webkitSubtle/rsaes-pkcs1-v1_5-decrypt.html: Removed.
  • crypto/webkitSubtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt: Removed.
  • crypto/webkitSubtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-expected.txt: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent-expected.txt: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent.html: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key.html: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-small-key-expected.txt: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk.html: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-sign-verify-expected.txt: Removed.
  • crypto/webkitSubtle/rsassa-pkcs1-v1_5-sign-verify.html: Removed.
  • crypto/webkitSubtle/sha-1-expected.txt: Removed.
  • crypto/webkitSubtle/sha-1.html: Removed.
  • crypto/webkitSubtle/sha-224-expected.txt: Removed.
  • crypto/webkitSubtle/sha-224.html: Removed.
  • crypto/webkitSubtle/sha-256-expected.txt: Removed.
  • crypto/webkitSubtle/sha-256.html: Removed.
  • crypto/webkitSubtle/sha-384-expected.txt: Removed.
  • crypto/webkitSubtle/sha-384.html: Removed.
  • crypto/webkitSubtle/sha-512-expected.txt: Removed.
  • crypto/webkitSubtle/sha-512.html: Removed.
  • crypto/webkitSubtle/unimplemented-unwrap-crash-expected.txt: Removed.
  • crypto/webkitSubtle/unimplemented-unwrap-crash.html: Removed.
  • crypto/webkitSubtle/unwrapKey-check-usage-expected.txt: Removed.
  • crypto/webkitSubtle/unwrapKey-check-usage.html: Removed.
  • crypto/webkitSubtle/wrapKey-check-usage-expected.txt: Removed.
  • crypto/webkitSubtle/wrapKey-check-usage.html: Removed.

Remove webkitSubtleCrypto tests.

  • fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt:

Remove webkitSubtleCrypto deprecation warning that no longer happens.

  • platform/ios-wk1/TestExpectations:
  • platform/win/TestExpectations:
  • platform/wpe/TestExpectations:

Remove webkitSubtle tests from expectations files.

Location:
trunk
Files:
23 deleted
51 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r220936 r220941  
     12017-08-18  Sam Weinig  <sam@webkit.org>
     2
     3        Remove the deprecated WebKitSubtleCrypto interface
     4        https://bugs.webkit.org/show_bug.cgi?id=164938
     5        <rdar://problem/29894563>
     6
     7        Reviewed by Chris Dumez.
     8
     9        * crypto/webkitSubtle: Removed.
     10        * crypto/webkitSubtle/aes-cbc-192-encrypt-decrypt-expected.txt: Removed.
     11        * crypto/webkitSubtle/aes-cbc-192-encrypt-decrypt.html: Removed.
     12        * crypto/webkitSubtle/aes-cbc-256-encrypt-decrypt-expected.txt: Removed.
     13        * crypto/webkitSubtle/aes-cbc-256-encrypt-decrypt.html: Removed.
     14        * crypto/webkitSubtle/aes-cbc-encrypt-decrypt-expected.txt: Removed.
     15        * crypto/webkitSubtle/aes-cbc-encrypt-decrypt-with-padding-expected.txt: Removed.
     16        * crypto/webkitSubtle/aes-cbc-encrypt-decrypt-with-padding.html: Removed.
     17        * crypto/webkitSubtle/aes-cbc-encrypt-decrypt.html: Removed.
     18        * crypto/webkitSubtle/aes-cbc-generate-key-expected.txt: Removed.
     19        * crypto/webkitSubtle/aes-cbc-generate-key.html: Removed.
     20        * crypto/webkitSubtle/aes-cbc-import-jwk-expected.txt: Removed.
     21        * crypto/webkitSubtle/aes-cbc-import-jwk.html: Removed.
     22        * crypto/webkitSubtle/aes-cbc-invalid-length-expected.txt: Removed.
     23        * crypto/webkitSubtle/aes-cbc-invalid-length.html: Removed.
     24        * crypto/webkitSubtle/aes-cbc-unwrap-failure-expected.txt: Removed.
     25        * crypto/webkitSubtle/aes-cbc-unwrap-failure.html: Removed.
     26        * crypto/webkitSubtle/aes-cbc-unwrap-rsa-expected.txt: Removed.
     27        * crypto/webkitSubtle/aes-cbc-unwrap-rsa.html: Removed.
     28        * crypto/webkitSubtle/aes-cbc-wrap-rsa-expected.txt: Removed.
     29        * crypto/webkitSubtle/aes-cbc-wrap-rsa-non-extractable-expected.txt: Removed.
     30        * crypto/webkitSubtle/aes-cbc-wrap-rsa-non-extractable.html: Removed.
     31        * crypto/webkitSubtle/aes-cbc-wrap-rsa.html: Removed.
     32        * crypto/webkitSubtle/aes-cbc-wrong-key-class-expected.txt: Removed.
     33        * crypto/webkitSubtle/aes-cbc-wrong-key-class.html: Removed.
     34        * crypto/webkitSubtle/aes-export-key-expected.txt: Removed.
     35        * crypto/webkitSubtle/aes-export-key.html: Removed.
     36        * crypto/webkitSubtle/aes-kw-key-manipulation-expected.txt: Removed.
     37        * crypto/webkitSubtle/aes-kw-key-manipulation.html: Removed.
     38        * crypto/webkitSubtle/aes-kw-wrap-unwrap-aes-expected.txt: Removed.
     39        * crypto/webkitSubtle/aes-kw-wrap-unwrap-aes.html: Removed.
     40        * crypto/webkitSubtle/aes-postMessage-expected.txt: Removed.
     41        * crypto/webkitSubtle/aes-postMessage.html: Removed.
     42        * crypto/webkitSubtle/argument-conversion-expected.txt: Removed.
     43        * crypto/webkitSubtle/argument-conversion.html: Removed.
     44        * crypto/webkitSubtle/array-buffer-view-offset-expected.txt: Removed.
     45        * crypto/webkitSubtle/array-buffer-view-offset.html: Removed.
     46        * crypto/webkitSubtle/disallowed-in-worker-expected.txt: Removed.
     47        * crypto/webkitSubtle/disallowed-in-worker.html: Removed.
     48        * crypto/webkitSubtle/gc-2-expected.txt: Removed.
     49        * crypto/webkitSubtle/gc-2.html: Removed.
     50        * crypto/webkitSubtle/gc-3-expected.txt: Removed.
     51        * crypto/webkitSubtle/gc-3.html: Removed.
     52        * crypto/webkitSubtle/gc-expected.txt: Removed.
     53        * crypto/webkitSubtle/gc.html: Removed.
     54        * crypto/webkitSubtle/hmac-check-algorithm-expected.txt: Removed.
     55        * crypto/webkitSubtle/hmac-check-algorithm.html: Removed.
     56        * crypto/webkitSubtle/hmac-export-key-expected.txt: Removed.
     57        * crypto/webkitSubtle/hmac-export-key.html: Removed.
     58        * crypto/webkitSubtle/hmac-generate-key-expected.txt: Removed.
     59        * crypto/webkitSubtle/hmac-generate-key.html: Removed.
     60        * crypto/webkitSubtle/hmac-import-jwk-expected.txt: Removed.
     61        * crypto/webkitSubtle/hmac-import-jwk.html: Removed.
     62        * crypto/webkitSubtle/hmac-postMessage-expected.txt: Removed.
     63        * crypto/webkitSubtle/hmac-postMessage.html: Removed.
     64        * crypto/webkitSubtle/hmac-sign-verify-empty-key-expected.txt: Removed.
     65        * crypto/webkitSubtle/hmac-sign-verify-empty-key.html: Removed.
     66        * crypto/webkitSubtle/hmac-sign-verify-expected.txt: Removed.
     67        * crypto/webkitSubtle/hmac-sign-verify.html: Removed.
     68        * crypto/webkitSubtle/import-export-raw-key-leak-expected.txt: Removed.
     69        * crypto/webkitSubtle/import-export-raw-key-leak.html: Removed.
     70        * crypto/webkitSubtle/import-jwk-expected.txt: Removed.
     71        * crypto/webkitSubtle/import-jwk.html: Removed.
     72        * crypto/webkitSubtle/jwk-export-use-values-expected.txt: Removed.
     73        * crypto/webkitSubtle/jwk-export-use-values.html: Removed.
     74        * crypto/webkitSubtle/jwk-import-use-values-expected.txt: Removed.
     75        * crypto/webkitSubtle/jwk-import-use-values.html: Removed.
     76        * crypto/webkitSubtle/resources: Removed.
     77        * crypto/webkitSubtle/resources/disallowed-in-worker.js: Removed.
     78        * crypto/webkitSubtle/resources/rsa-indexeddb-non-exportable.js: Removed.
     79        * crypto/webkitSubtle/resources/rsa-indexeddb.js: Removed.
     80        * crypto/webkitSubtle/rsa-export-generated-keys-expected.txt: Removed.
     81        * crypto/webkitSubtle/rsa-export-generated-keys.html: Removed.
     82        * crypto/webkitSubtle/rsa-export-key-expected.txt: Removed.
     83        * crypto/webkitSubtle/rsa-export-key.html: Removed.
     84        * crypto/webkitSubtle/rsa-export-private-key-expected.txt: Removed.
     85        * crypto/webkitSubtle/rsa-export-private-key.html: Removed.
     86        * crypto/webkitSubtle/rsa-indexeddb-expected.txt: Removed.
     87        * crypto/webkitSubtle/rsa-indexeddb-non-exportable-expected.txt: Removed.
     88        * crypto/webkitSubtle/rsa-indexeddb-non-exportable-private-expected.txt: Removed.
     89        * crypto/webkitSubtle/rsa-indexeddb-non-exportable-private.html: Removed.
     90        * crypto/webkitSubtle/rsa-indexeddb-non-exportable.html: Removed.
     91        * crypto/webkitSubtle/rsa-indexeddb-private-expected.txt: Removed.
     92        * crypto/webkitSubtle/rsa-indexeddb-private.html: Removed.
     93        * crypto/webkitSubtle/rsa-indexeddb.html: Removed.
     94        * crypto/webkitSubtle/rsa-oaep-generate-non-extractable-key-expected.txt: Removed.
     95        * crypto/webkitSubtle/rsa-oaep-generate-non-extractable-key.html: Removed.
     96        * crypto/webkitSubtle/rsa-oaep-key-manipulation-expected.txt: Removed.
     97        * crypto/webkitSubtle/rsa-oaep-key-manipulation.html: Removed.
     98        * crypto/webkitSubtle/rsa-oaep-plaintext-length-expected.txt: Removed.
     99        * crypto/webkitSubtle/rsa-oaep-plaintext-length.html: Removed.
     100        * crypto/webkitSubtle/rsa-oaep-wrap-unwrap-aes-expected.txt: Removed.
     101        * crypto/webkitSubtle/rsa-oaep-wrap-unwrap-aes.html: Removed.
     102        * crypto/webkitSubtle/rsa-postMessage-expected.txt: Removed.
     103        * crypto/webkitSubtle/rsa-postMessage.html: Removed.
     104        * crypto/webkitSubtle/rsaes-pkcs1-v1_5-decrypt-expected.txt: Removed.
     105        * crypto/webkitSubtle/rsaes-pkcs1-v1_5-decrypt.html: Removed.
     106        * crypto/webkitSubtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes-expected.txt: Removed.
     107        * crypto/webkitSubtle/rsaes-pkcs1-v1_5-wrap-unwrap-aes.html: Removed.
     108        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-expected.txt: Removed.
     109        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent-expected.txt: Removed.
     110        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key-with-leading-zeroes-in-exponent.html: Removed.
     111        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-generate-key.html: Removed.
     112        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-expected.txt: Removed.
     113        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-small-key-expected.txt: Removed.
     114        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html: Removed.
     115        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-import-jwk.html: Removed.
     116        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-sign-verify-expected.txt: Removed.
     117        * crypto/webkitSubtle/rsassa-pkcs1-v1_5-sign-verify.html: Removed.
     118        * crypto/webkitSubtle/sha-1-expected.txt: Removed.
     119        * crypto/webkitSubtle/sha-1.html: Removed.
     120        * crypto/webkitSubtle/sha-224-expected.txt: Removed.
     121        * crypto/webkitSubtle/sha-224.html: Removed.
     122        * crypto/webkitSubtle/sha-256-expected.txt: Removed.
     123        * crypto/webkitSubtle/sha-256.html: Removed.
     124        * crypto/webkitSubtle/sha-384-expected.txt: Removed.
     125        * crypto/webkitSubtle/sha-384.html: Removed.
     126        * crypto/webkitSubtle/sha-512-expected.txt: Removed.
     127        * crypto/webkitSubtle/sha-512.html: Removed.
     128        * crypto/webkitSubtle/unimplemented-unwrap-crash-expected.txt: Removed.
     129        * crypto/webkitSubtle/unimplemented-unwrap-crash.html: Removed.
     130        * crypto/webkitSubtle/unwrapKey-check-usage-expected.txt: Removed.
     131        * crypto/webkitSubtle/unwrapKey-check-usage.html: Removed.
     132        * crypto/webkitSubtle/wrapKey-check-usage-expected.txt: Removed.
     133        * crypto/webkitSubtle/wrapKey-check-usage.html: Removed.
     134
     135            Remove webkitSubtleCrypto tests.
     136
     137        * fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt:
     138
     139            Remove webkitSubtleCrypto deprecation warning that no longer happens.
     140
     141        * platform/ios-wk1/TestExpectations:
     142        * platform/win/TestExpectations:
     143        * platform/wpe/TestExpectations:
     144
     145            Remove webkitSubtle tests from expectations files.
     146
    11472017-08-18  Jonathan Bedard  <jbedard@apple.com>
    2148

  • trunk/LayoutTests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt

    r219405 r220941  
    1 CONSOLE MESSAGE: line 106: WebKitSubtleCrypto is deprecated. Please use SubtleCrypto instead.
    21Pass. WebKit didn't crash.

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r220915 r220941  
    791791crypto/subtle/ecdh-import-spki-key-ecdh-identifier.html [ Pass ]
    792792
    793 # These are legacy APIs that we don't support, apart from a few digest algorithms.
    794 webkit.org/b/133122 crypto/webkitSubtle [ Skip ]
    795 webkit.org/b/133319 crypto/webkitSubtle/sha-1.html [ Pass ]
    796 webkit.org/b/133319 crypto/webkitSubtle/sha-224.html [ Pass ]
    797 webkit.org/b/133319 crypto/webkitSubtle/sha-256.html [ Pass ]
    798 webkit.org/b/133319 crypto/webkitSubtle/sha-384.html [ Pass ]
    799 webkit.org/b/133319 crypto/webkitSubtle/sha-512.html [ Pass ]
    800 webkit.org/b/133320 crypto/webkitSubtle/hmac-check-algorithm.html [ Pass ]
    801 webkit.org/b/133320 crypto/webkitSubtle/hmac-export-key.html [ Pass ]
    802 webkit.org/b/133320 crypto/webkitSubtle/hmac-generate-key.html [ Pass ]
    803 webkit.org/b/133320 crypto/webkitSubtle/hmac-import-jwk.html [ Pass ]
    804 webkit.org/b/133320 crypto/webkitSubtle/hmac-sign-verify-empty-key.html [ Pass ]
    805 webkit.org/b/133320 crypto/webkitSubtle/hmac-sign-verify.html [ Pass ]
    806 
    807793# These are the imported web-platform-tests covering crypto sections we haven't implemented yet.
    808794imported/w3c/web-platform-tests/WebCryptoAPI/ [ Slow ]

  • trunk/LayoutTests/platform/ios-wk1/TestExpectations

    r220311 r220941  
    10061006imported/w3c/IndexedDB-private-browsing
    10071007imported/w3c/web-platform-tests/IndexedDB
    1008 crypto/webkitSubtle/rsa-indexeddb-non-exportable-private.html
    1009 crypto/webkitSubtle/rsa-indexeddb-non-exportable.html
    1010 crypto/webkitSubtle/rsa-indexeddb-private.html
    1011 crypto/webkitSubtle/rsa-indexeddb.html
    10121008fast/history/page-cache-indexed-closed-db.html
    10131009fast/history/page-cache-indexed-opened-db.html

  • trunk/LayoutTests/platform/win/TestExpectations

    r220912 r220941  
    258258http/tests/security/cross-origin-worker-indexeddb.html [ Skip ]
    259259http/tests/security/no-indexeddb-from-sandbox.html [ Skip ]
    260 crypto/webkitSubtle/rsa-indexeddb-non-exportable-private.html [ Skip ]
    261 crypto/webkitSubtle/rsa-indexeddb-non-exportable.html [ Skip ]
    262 crypto/webkitSubtle/rsa-indexeddb-private.html [ Skip ]
    263 crypto/webkitSubtle/rsa-indexeddb.html [ Skip ]
    264260fast/history/page-cache-indexed-closed-db.html [ Skip ]
    265261fast/history/page-cache-indexed-opened-db.html [ Skip ]
    … …  
    583579
    584580# TODO crypto.subtle is not yet enabled
    585 crypto/webkitSubtle/ [ Skip ]
    586581crypto/subtle/ [ Skip ]
    587582crypto/workers/subtle/ [ Skip ]

  • trunk/LayoutTests/platform/wpe/TestExpectations

    r220460 r220941  
    662662webkit.org/b/159754 workers/bomb.html [ Slow ]
    663663
    664 # We won't be supporting the deprecated interfaces.
    665 crypto/webkitSubtle [ Skip ]
    666 
    667664# These are failures that will be enabled once the relevant parts of implementation land.
    668665webkit.org/b/133122 crypto/subtle/aes-cfb-generate-export-key-jwk-length-128.html [ Skip ]

  • trunk/Source/WebCore/CMakeLists.txt

    r220924 r220941  
    373373    crypto/RsaOtherPrimesInfo.idl
    374374    crypto/SubtleCrypto.idl
    375     crypto/WebKitSubtleCrypto.idl
    376375
    377376    crypto/keys/CryptoAesKeyAlgorithm.idl
    … …  
    11871186    bindings/js/JSCallbackData.cpp
    11881187    bindings/js/JSCanvasRenderingContext2DCustom.cpp
    1189     bindings/js/JSCryptoAlgorithmDictionary.cpp
    1190     bindings/js/JSCryptoKeySerializationJWK.cpp
    1191     bindings/js/JSCryptoOperationData.cpp
    11921188    bindings/js/JSCustomElementInterface.cpp
    11931189    bindings/js/JSCustomElementRegistryCustom.cpp
    … …  
    12591255    bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp
    12601256    bindings/js/JSWebGPURenderingContextCustom.cpp
    1261     bindings/js/JSWebKitSubtleCryptoCustom.cpp
    12621257    bindings/js/JSWorkerGlobalScopeBase.cpp
    12631258    bindings/js/JSWorkerGlobalScopeCustom.cpp
    … …  
    13181313    crypto/CryptoKey.cpp
    13191314    crypto/SubtleCrypto.cpp
    1320     crypto/WebKitSubtleCrypto.cpp
    13211315
    13221316    crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
    … …  
    13471341    crypto/keys/CryptoKeyRSA.cpp
    13481342    crypto/keys/CryptoKeyRaw.cpp
    1349     crypto/keys/CryptoKeySerializationRaw.cpp
    13501343
    13511344    css/BasicShapeFunctions.cpp

  • trunk/Source/WebCore/ChangeLog

    r220940 r220941  
     12017-08-18  Sam Weinig  <sam@webkit.org>
     2
     3        Remove the deprecated WebKitSubtleCrypto interface
     4        https://bugs.webkit.org/show_bug.cgi?id=164938
     5        <rdar://problem/29894563>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Remove WebKitSubtleCrypto and all of its helper classes / functionality.
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.cpp:
     13        * DerivedSources.make:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * bindings/js/JSCryptoAlgorithmDictionary.cpp: Removed.
     16        * bindings/js/JSCryptoAlgorithmDictionary.h: Removed.
     17        * bindings/js/JSCryptoKeySerializationJWK.cpp: Removed.
     18        * bindings/js/JSCryptoKeySerializationJWK.h: Removed.
     19        * bindings/js/JSCryptoOperationData.cpp: Removed.
     20        * bindings/js/JSCryptoOperationData.h: Removed.
     21        * bindings/js/JSWebKitSubtleCryptoCustom.cpp: Removed.
     22        * crypto/CryptoAlgorithm.cpp:
     23        (WebCore::CryptoAlgorithm::deriveKey): Deleted.
     24        (WebCore::CryptoAlgorithm::encryptForWrapKey): Deleted.
     25        (WebCore::CryptoAlgorithm::decryptForUnwrapKey): Deleted.
     26        * crypto/CryptoAlgorithm.h:
     27        * crypto/CryptoAlgorithmParametersDeprecated.h: Removed.
     28        * crypto/CryptoKeySerialization.h: Removed.
     29        * crypto/WebKitSubtleCrypto.cpp: Removed.
     30        * crypto/WebKitSubtleCrypto.h: Removed.
     31        * crypto/WebKitSubtleCrypto.idl: Removed.
     32        * crypto/algorithms/CryptoAlgorithmAES_CBC.cpp:
     33        (WebCore::CryptoAlgorithmAES_CBC::keyAlgorithmMatches const): Deleted.
     34        * crypto/algorithms/CryptoAlgorithmAES_CBC.h:
     35        * crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
     36        (WebCore::CryptoAlgorithmAES_KW::encryptForWrapKey): Deleted.
     37        (WebCore::CryptoAlgorithmAES_KW::decryptForUnwrapKey): Deleted.
     38        * crypto/algorithms/CryptoAlgorithmAES_KW.h:
     39        * crypto/algorithms/CryptoAlgorithmHMAC.cpp:
     40        (WebCore::CryptoAlgorithmHMAC::keyAlgorithmMatches const): Deleted.
     41        * crypto/algorithms/CryptoAlgorithmHMAC.h:
     42        * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
     43        * crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h:
     44        * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
     45        (WebCore::CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches const): Deleted.
     46        * crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h:
     47        * crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
     48        (WebCore::CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches const): Deleted.
     49        * crypto/algorithms/CryptoAlgorithmRSA_OAEP.h:
     50        * crypto/algorithms/CryptoAlgorithmSHA1.cpp:
     51        * crypto/algorithms/CryptoAlgorithmSHA1.h:
     52        * crypto/algorithms/CryptoAlgorithmSHA224.cpp:
     53        * crypto/algorithms/CryptoAlgorithmSHA224.h:
     54        * crypto/algorithms/CryptoAlgorithmSHA256.cpp:
     55        * crypto/algorithms/CryptoAlgorithmSHA256.h:
     56        * crypto/algorithms/CryptoAlgorithmSHA384.cpp:
     57        * crypto/algorithms/CryptoAlgorithmSHA384.h:
     58        * crypto/algorithms/CryptoAlgorithmSHA512.cpp:
     59        * crypto/algorithms/CryptoAlgorithmSHA512.h:
     60        * crypto/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp:
     61        * crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp:
     62        (WebCore::CryptoAlgorithmAES_KW::platformEncrypt): Deleted.
     63        (WebCore::CryptoAlgorithmAES_KW::platformDecrypt): Deleted.
     64        * crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp:
     65        * crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp:
     66        * crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp:
     67        * crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp:
     68        * crypto/keys/CryptoKeySerializationRaw.cpp: Removed.
     69        * crypto/keys/CryptoKeySerializationRaw.h: Removed.
     70        * crypto/mac/CryptoAlgorithmAES_CBCMac.cpp:
     71        * crypto/mac/CryptoAlgorithmAES_KWMac.cpp:
     72        (WebCore::CryptoAlgorithmAES_KW::platformEncrypt): Deleted.
     73        (WebCore::CryptoAlgorithmAES_KW::platformDecrypt): Deleted.
     74        * crypto/mac/CryptoAlgorithmHMACMac.cpp:
     75        * crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp:
     76        * crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
     77        * crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp:
     78        * crypto/parameters/CryptoAlgorithmAesCbcParamsDeprecated.h: Removed.
     79        * crypto/parameters/CryptoAlgorithmAesKeyGenParamsDeprecated.h: Removed.
     80        * crypto/parameters/CryptoAlgorithmHmacKeyParamsDeprecated.h: Removed.
     81        * crypto/parameters/CryptoAlgorithmHmacParamsDeprecated.h: Removed.
     82        * crypto/parameters/CryptoAlgorithmRsaKeyGenParamsDeprecated.h: Removed.
     83        * crypto/parameters/CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h: Removed.
     84        * crypto/parameters/CryptoAlgorithmRsaOaepParamsDeprecated.h: Removed.
     85        * crypto/parameters/CryptoAlgorithmRsaSsaParamsDeprecated.h: Removed.
     86        * features.json:
     87        * page/Crypto.cpp:
     88        * page/Crypto.h:
     89        * page/Crypto.idl:
     90
    1912017-08-18  Tim Horton  <timothy_horton@apple.com>
    292

  • trunk/Source/WebCore/DerivedSources.cpp

    r220734 r220941  
    624624#include "JSWebKitPlaybackTargetAvailabilityEvent.cpp"
    625625#include "JSWebKitPoint.cpp"
    626 #include "JSWebKitSubtleCrypto.cpp"
    627626#include "JSWebKitTransitionEvent.cpp"
    628627#include "JSWebSocket.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r220732 r220941  
    307307    $(WebCore)/crypto/RsaOtherPrimesInfo.idl \
    308308    $(WebCore)/crypto/SubtleCrypto.idl \
    309     $(WebCore)/crypto/WebKitSubtleCrypto.idl \
    310309    $(WebCore)/crypto/keys/CryptoAesKeyAlgorithm.idl \
    311310    $(WebCore)/crypto/keys/CryptoEcKeyAlgorithm.idl \

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r220935 r220941  
    25472547                5706A6981DDE5E4600A03B14 /* JSRsaOaepParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 5706A6971DDE5E4600A03B14 /* JSRsaOaepParams.h */; };
    25482548                5706A69A1DDE5E8500A03B14 /* JSRsaOaepParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5706A6991DDE5E8500A03B14 /* JSRsaOaepParams.cpp */; };
    2549                 5709E8CD1D413D47003244AC /* WebKitSubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */; };
    2550                 5709E8CE1D413D5B003244AC /* JSWebKitSubtleCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */; };
    2551                 5709E8CF1D413D9A003244AC /* WebKitSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */; };
    2552                 570A99DA1D417408004EC630 /* JSWebKitSubtleCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */; };
    2553                 570A99DB1D41A2F3004EC630 /* JSWebKitSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */; };
    25542549                571252691E524EB1008FF369 /* CryptoAlgorithmAES_CFB.h in Headers */ = {isa = PBXBuildFile; fileRef = 571252681E524EB1008FF369 /* CryptoAlgorithmAES_CFB.h */; };
    25552550                571F21891DA57C54005C9EFD /* JSSubtleCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 571F21881DA57C54005C9EFD /* JSSubtleCrypto.h */; };
    … …  
    64946489                E125F8361822F18A00D84CD9 /* CryptoKeyHMAC.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8341822F18A00D84CD9 /* CryptoKeyHMAC.h */; };
    64956490                E125F8381822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F8371822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp */; };
    6496                 E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */; };
    6497                 E125F83D182411E700D84CD9 /* JSCryptoOperationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F83B182411E700D84CD9 /* JSCryptoOperationData.cpp */; };
    6498                 E125F83E182411E700D84CD9 /* JSCryptoOperationData.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */; };
    64996491                E125F8411824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F83F1824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp */; };
    65006492                E125F8421824253A00D84CD9 /* CryptoAlgorithmAES_CBC.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F8401824253A00D84CD9 /* CryptoAlgorithmAES_CBC.h */; };
    … …  
    65026494                E125F84D1824289D00D84CD9 /* CryptoKeyAES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F84B1824289D00D84CD9 /* CryptoKeyAES.cpp */; };
    65036495                E125F84E1824289D00D84CD9 /* CryptoKeyAES.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F84C1824289D00D84CD9 /* CryptoKeyAES.h */; };
    6504                 E125F85118283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F84F18283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp */; };
    6505                 E125F85218283A5600D84CD9 /* JSCryptoKeySerializationJWK.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F85018283A5600D84CD9 /* JSCryptoKeySerializationJWK.h */; };
    6506                 E125F856182C0F8300D84CD9 /* CryptoKeySerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F855182C0F8300D84CD9 /* CryptoKeySerialization.h */; };
    6507                 E125F859182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F857182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp */; };
    6508                 E125F85A182C1AA600D84CD9 /* CryptoKeySerializationRaw.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F858182C1AA600D84CD9 /* CryptoKeySerializationRaw.h */; };
    65096496                E125F85E182C2DF600D84CD9 /* CryptoKeyData.h in Headers */ = {isa = PBXBuildFile; fileRef = E125F85D182C2DF600D84CD9 /* CryptoKeyData.h */; };
    65106497                E125F863182C303A00D84CD9 /* CryptoKeyDataOctetSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E125F861182C303A00D84CD9 /* CryptoKeyDataOctetSequence.cpp */; };
    … …  
    65886575                E19AC3F41824DC7900349426 /* CryptoAlgorithmSHA512.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E19AC3EC1824DC7900349426 /* CryptoAlgorithmSHA512.cpp */; };
    65896576                E19AC3F51824DC7900349426 /* CryptoAlgorithmSHA512.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3ED1824DC7900349426 /* CryptoAlgorithmSHA512.h */; };
    6590                 E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */; };
    65916577                E19AC3F9182566F700349426 /* CryptoKeyMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E19AC3F8182566F700349426 /* CryptoKeyMac.cpp */; };
    6592                 E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */; };
    65936578                E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */; };
    65946579                E1A3162D134BC32D007C9A4F /* WebNSAttributedStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    66176602                E1BD3319182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */; };
    66186603                E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */; };
    6619                 E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */; };
    6620                 E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */; };
    66216604                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */; };
    66226605                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */; };
    66236606                E1C266D818317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C266D618317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp */; };
    6624                 E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */; };
    66256607                E1C266DE18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C266DC18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp */; };
    66266608                E1C266DF18319F31003F8B33 /* CryptoKeyDataRSAComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C266DD18319F31003F8B33 /* CryptoKeyDataRSAComponents.h */; };
    … …  
    66376619                E1C4DE690EA75C1E0023CCD6 /* ActiveDOMObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C4DE680EA75C1E0023CCD6 /* ActiveDOMObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    66386620                E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */; };
    6639                 E1C657121815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */; };
    6640                 E1C657131815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657111815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h */; };
    6641                 E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */; };
    66426621                E1C657251816E69D00256CDD /* CryptoAlgorithmIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */; };
    6643                 E1C657271816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */; };
    66446622                E1C8BE5D0E8BD15A0064CB7D /* JSWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */; };
    66456623                E1C94AF9191303F000D5A893 /* BlobPart.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C94AF7191303F000D5A893 /* BlobPart.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    66656643                E1FE137418402A6700892F13 /* CommonCryptoUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE137218402A6700892F13 /* CommonCryptoUtilities.cpp */; };
    66666644                E1FE137518402A6700892F13 /* CommonCryptoUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE137318402A6700892F13 /* CommonCryptoUtilities.h */; };
    6667                 E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */; };
    66686645                E1FE137A184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FE1378184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp */; };
    66696646                E1FE137B184D21BB00892F13 /* CryptoAlgorithmAES_KW.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FE1379184D21BB00892F13 /* CryptoAlgorithmAES_KW.h */; };
    … …  
    1032110298                5706A6971DDE5E4600A03B14 /* JSRsaOaepParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRsaOaepParams.h; sourceTree = "<group>"; };
    1032210299                5706A6991DDE5E8500A03B14 /* JSRsaOaepParams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRsaOaepParams.cpp; sourceTree = "<group>"; };
    10323                 5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitSubtleCrypto.cpp; sourceTree = "<group>"; };
    10324                 5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitSubtleCrypto.h; sourceTree = "<group>"; };
    10325                 5709E8CC1D413CE3003244AC /* WebKitSubtleCrypto.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitSubtleCrypto.idl; sourceTree = "<group>"; };
    1032610300                571252681E524EB1008FF369 /* CryptoAlgorithmAES_CFB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAES_CFB.h; sourceTree = "<group>"; };
    1032710301                5712526A1E52527C008FF369 /* CryptoAlgorithmAES_CFB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_CFB.cpp; sourceTree = "<group>"; };
    … …  
    1509915073                E125F8341822F18A00D84CD9 /* CryptoKeyHMAC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyHMAC.h; sourceTree = "<group>"; };
    1510015074                E125F8371822F1EB00D84CD9 /* CryptoAlgorithmHMACMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmHMACMac.cpp; sourceTree = "<group>"; };
    15101                 E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesCbcParamsDeprecated.h; sourceTree = "<group>"; };
    15102                 E125F83B182411E700D84CD9 /* JSCryptoOperationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoOperationData.cpp; sourceTree = "<group>"; };
    15103                 E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoOperationData.h; sourceTree = "<group>"; };
    1510415075                E125F83F1824253A00D84CD9 /* CryptoAlgorithmAES_CBC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_CBC.cpp; sourceTree = "<group>"; };
    1510515076                E125F8401824253A00D84CD9 /* CryptoAlgorithmAES_CBC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAES_CBC.h; sourceTree = "<group>"; };
    … …  
    1510715078                E125F84B1824289D00D84CD9 /* CryptoKeyAES.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyAES.cpp; sourceTree = "<group>"; };
    1510815079                E125F84C1824289D00D84CD9 /* CryptoKeyAES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyAES.h; sourceTree = "<group>"; };
    15109                 E125F84F18283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoKeySerializationJWK.cpp; sourceTree = "<group>"; };
    15110                 E125F85018283A5600D84CD9 /* JSCryptoKeySerializationJWK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoKeySerializationJWK.h; sourceTree = "<group>"; };
    15111                 E125F855182C0F8300D84CD9 /* CryptoKeySerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeySerialization.h; sourceTree = "<group>"; };
    15112                 E125F857182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeySerializationRaw.cpp; sourceTree = "<group>"; };
    15113                 E125F858182C1AA600D84CD9 /* CryptoKeySerializationRaw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeySerializationRaw.h; sourceTree = "<group>"; };
    1511415080                E125F85D182C2DF600D84CD9 /* CryptoKeyData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyData.h; sourceTree = "<group>"; };
    1511515081                E125F861182C303A00D84CD9 /* CryptoKeyDataOctetSequence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyDataOctetSequence.cpp; sourceTree = "<group>"; };
    … …  
    1519815164                E19AC3EC1824DC7900349426 /* CryptoAlgorithmSHA512.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmSHA512.cpp; sourceTree = "<group>"; };
    1519915165                E19AC3ED1824DC7900349426 /* CryptoAlgorithmSHA512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmSHA512.h; sourceTree = "<group>"; };
    15200                 E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAesKeyGenParamsDeprecated.h; sourceTree = "<group>"; };
    1520115166                E19AC3F8182566F700349426 /* CryptoKeyMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyMac.cpp; sourceTree = "<group>"; };
    15202                 E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacKeyParamsDeprecated.h; sourceTree = "<group>"; };
    1520315167                E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerNodeAlgorithms.h; sourceTree = "<group>"; };
    1520415168                E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNSAttributedStringExtras.h; sourceTree = "<group>"; };
    … …  
    1523515199                E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp; sourceTree = "<group>"; };
    1523615200                E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.h; sourceTree = "<group>"; };
    15237                 E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaSsaParamsDeprecated.h; sourceTree = "<group>"; };
    15238                 E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyGenParamsDeprecated.h; sourceTree = "<group>"; };
    1523915201                E1BE512B0CF6C512002EA959 /* XSLTUnicodeSort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTUnicodeSort.cpp; sourceTree = "<group>"; };
    1524015202                E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTUnicodeSort.h; sourceTree = "<group>"; };
    1524115203                E1C266D618317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp; sourceTree = "<group>"; };
    15242                 E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h; sourceTree = "<group>"; };
    1524315204                E1C266DC18319F31003F8B33 /* CryptoKeyDataRSAComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoKeyDataRSAComponents.cpp; sourceTree = "<group>"; };
    1524415205                E1C266DD18319F31003F8B33 /* CryptoKeyDataRSAComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyDataRSAComponents.h; sourceTree = "<group>"; };
    … …  
    1525515216                E1C4DE680EA75C1E0023CCD6 /* ActiveDOMObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActiveDOMObject.h; sourceTree = "<group>"; };
    1525615217                E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActiveDOMObject.cpp; sourceTree = "<group>"; };
    15257                 E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCryptoAlgorithmDictionary.cpp; sourceTree = "<group>"; };
    15258                 E1C657111815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCryptoAlgorithmDictionary.h; sourceTree = "<group>"; };
    15259                 E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmHmacParamsDeprecated.h; sourceTree = "<group>"; };
    1526015218                E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmIdentifier.h; sourceTree = "<group>"; };
    15261                 E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmParametersDeprecated.h; sourceTree = "<group>"; };
    1526215219                E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMWindowConstructors.idl; sourceTree = "<group>"; };
    1526315220                E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorker.cpp; sourceTree = "<group>"; };
    … …  
    1528615243                E1FE137218402A6700892F13 /* CommonCryptoUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonCryptoUtilities.cpp; sourceTree = "<group>"; };
    1528715244                E1FE137318402A6700892F13 /* CommonCryptoUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonCryptoUtilities.h; sourceTree = "<group>"; };
    15288                 E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRsaOaepParamsDeprecated.h; sourceTree = "<group>"; };
    1528915245                E1FE1378184D21BB00892F13 /* CryptoAlgorithmAES_KW.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_KW.cpp; sourceTree = "<group>"; };
    1529015246                E1FE1379184D21BB00892F13 /* CryptoAlgorithmAES_KW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmAES_KW.h; sourceTree = "<group>"; };
    … …  
    1529215248                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
    1529315249                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
    15294                 E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitSubtleCrypto.cpp; sourceTree = "<group>"; };
    15295                 E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitSubtleCrypto.h; sourceTree = "<group>"; };
    15296                 E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitSubtleCryptoCustom.cpp; sourceTree = "<group>"; };
    1529715250                E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistry.cpp; sourceTree = "<group>"; };
    1529815251                E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRegistry.h; sourceTree = "<group>"; };
    … …  
    2358723540                                C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */,
    2358823541                                C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */,
    23589                                 E1C657101815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp */,
    23590                                 E1C657111815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h */,
    23591                                 E125F84F18283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp */,
    23592                                 E125F85018283A5600D84CD9 /* JSCryptoKeySerializationJWK.h */,
    23593                                 E125F83B182411E700D84CD9 /* JSCryptoOperationData.cpp */,
    23594                                 E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */,
    2359523542                                9BD4E9141C462872005065BC /* JSCustomElementInterface.cpp */,
    2359623543                                9BD4E9151C462872005065BC /* JSCustomElementInterface.h */,
    … …  
    2368123628                                BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */,
    2368223629                                418C395D1C8F0AAB0051C8A3 /* JSReadableStreamSourceCustom.cpp */,
    23683                                 E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */,
    2368423630                        );
    2368523631                        name = Custom;
    … …  
    2462724573                                57E2336A1DCC262400F28D01 /* CryptoKeyRSA.cpp */,
    2462824574                                E164FAA218315BF400DB4E61 /* CryptoKeyRSA.h */,
    24629                                 E125F857182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp */,
    24630                                 E125F858182C1AA600D84CD9 /* CryptoKeySerializationRaw.h */,
    2463124575                                7C9ACAA61F3CCEB400F3AA09 /* CryptoRsaHashedKeyAlgorithm.h */,
    2463224576                                7C9ACAA71F3CCEB400F3AA09 /* CryptoRsaHashedKeyAlgorithm.idl */,
    … …  
    2464524589                                577483101DADC49900716EF9 /* AesKeyParams.idl */,
    2464624590                                572093D21DDCEB9A00310AB0 /* CryptoAlgorithmAesCbcCfbParams.h */,
    24647                                 E125F8391824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h */,
    2464824591                                57E1E5A61E8DBD3E00EE37C9 /* CryptoAlgorithmAesCtrParams.h */,
    2464924592                                57B5F8081E5D1A9800F34F90 /* CryptoAlgorithmAesGcmParams.h */,
    24650                                 E19AC3F61824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h */,
    2465124593                                577483111DADC55D00716EF9 /* CryptoAlgorithmAesKeyParams.h */,
    2465224594                                576814291E6F99C100E77754 /* CryptoAlgorithmEcdhKeyDeriveParams.h */,
    … …  
    2465524597                                57957CAF1E972645008072AB /* CryptoAlgorithmHkdfParams.h */,
    2465624598                                577483181DB4491F00716EF9 /* CryptoAlgorithmHmacKeyParams.h */,
    24657                                 E19DA29B18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h */,
    24658                                 E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h */,
    2465924599                                57E657EB1E7162EA00F941CA /* CryptoAlgorithmPbkdf2Params.h */,
    2466024600                                57E2336D1DCD43FD00F28D01 /* CryptoAlgorithmRsaHashedImportParams.h */,
    2466124601                                57E233741DCD6D3B00F28D01 /* CryptoAlgorithmRsaHashedKeyGenParams.h */,
    2466224602                                57FEDD3E1DB6D59200EB96F5 /* CryptoAlgorithmRsaKeyGenParams.h */,
    24663                                 E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h */,
    24664                                 E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h */,
    2466524603                                5706A6951DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h */,
    24666                                 E1FE1376184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h */,
    2466724604                                5721A9881ECE57040081295A /* CryptoAlgorithmRsaPssParams.h */,
    24668                                 E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h */,
    2466924605                                576814281E6F98AD00E77754 /* EcdhKeyDeriveParams.idl */,
    2467024606                                57EEAA4E1E9FFBFC00701124 /* EcdsaParams.idl */,
    … …  
    2480124737                                573489381DAC6B6D00DC0667 /* CryptoAlgorithmParameters.h */,
    2480224738                                574AC7531DAC367D00E9744C /* CryptoAlgorithmParameters.idl */,
    24803                                 E1C657261816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h */,
    2480424739                                E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */,
    2480524740                                E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */,
    … …  
    2481124746                                E1F80B8618317252007885C3 /* CryptoKeyPair.h */,
    2481224747                                E1F80B8418317247007885C3 /* CryptoKeyPair.idl */,
    24813                                 E125F855182C0F8300D84CD9 /* CryptoKeySerialization.h */,
    2481424748                                E19727151820549E00592D51 /* CryptoKeyType.h */,
    2481524749                                E172AF6F180F289500FBADB9 /* CryptoKeyUsage.h */,
    … …  
    2482324757                                5778BD811DA4802C009E3009 /* SubtleCrypto.h */,
    2482424758                                5778BD801DA4733E009E3009 /* SubtleCrypto.idl */,
    24825                                 5709E8CA1D413CE3003244AC /* WebKitSubtleCrypto.cpp */,
    24826                                 5709E8CB1D413CE3003244AC /* WebKitSubtleCrypto.h */,
    24827                                 5709E8CC1D413CE3003244AC /* WebKitSubtleCrypto.idl */,
    2482824759                        );
    2482924760                        path = crypto;
    … …  
    2488924820                                571F218A1DA57C7A005C9EFD /* JSSubtleCrypto.cpp */,
    2489024821                                571F21881DA57C54005C9EFD /* JSSubtleCrypto.h */,
    24891                                 E1FF8F62180745D800132674 /* JSWebKitSubtleCrypto.cpp */,
    24892                                 E1FF8F63180745D800132674 /* JSWebKitSubtleCrypto.h */,
    2489324822                        );
    2489424823                        name = Crypto;
    … …  
    2692226851                                E1FE137B184D21BB00892F13 /* CryptoAlgorithmAES_KW.h in Headers */,
    2692326852                                572093D31DDCEB9A00310AB0 /* CryptoAlgorithmAesCbcCfbParams.h in Headers */,
    26924                                 E125F83A1824104800D84CD9 /* CryptoAlgorithmAesCbcParamsDeprecated.h in Headers */,
    2692526853                                57E1E5A71E8DBD3E00EE37C9 /* CryptoAlgorithmAesCtrParams.h in Headers */,
    2692626854                                57B5F8091E5D1A9800F34F90 /* CryptoAlgorithmAesGcmParams.h in Headers */,
    26927                                 E19AC3F71824E5D100349426 /* CryptoAlgorithmAesKeyGenParamsDeprecated.h in Headers */,
    2692826855                                577483121DADC55D00716EF9 /* CryptoAlgorithmAesKeyParams.h in Headers */,
    2692926856                                5750A9871E6A216800705C4A /* CryptoAlgorithmECDH.h in Headers */,
    … …  
    2693626863                                E125F8321822F11B00D84CD9 /* CryptoAlgorithmHMAC.h in Headers */,
    2693726864                                577483191DB4491F00716EF9 /* CryptoAlgorithmHmacKeyParams.h in Headers */,
    26938                                 E19DA29C18189ADD00088BC8 /* CryptoAlgorithmHmacKeyParamsDeprecated.h in Headers */,
    26939                                 E1C6571F1816E50300256CDD /* CryptoAlgorithmHmacParamsDeprecated.h in Headers */,
    2694026865                                E1C657251816E69D00256CDD /* CryptoAlgorithmIdentifier.h in Headers */,
    2694126866                                573489391DAC6B6E00DC0667 /* CryptoAlgorithmParameters.h in Headers */,
    26942                                 E1C657271816F9FE00256CDD /* CryptoAlgorithmParametersDeprecated.h in Headers */,
    2694326867                                57777E391E71217D00EE1A8D /* CryptoAlgorithmPBKDF2.h in Headers */,
    2694426868                                57E657EC1E7162EA00F941CA /* CryptoAlgorithmPbkdf2Params.h in Headers */,
    … …  
    2694926873                                57E2336E1DCD43FD00F28D01 /* CryptoAlgorithmRsaHashedImportParams.h in Headers */,
    2695026874                                57FEDD3F1DB6D59200EB96F5 /* CryptoAlgorithmRsaKeyGenParams.h in Headers */,
    26951                                 E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParamsDeprecated.h in Headers */,
    26952                                 E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h in Headers */,
    2695326875                                5706A6961DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h in Headers */,
    26954                                 E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParamsDeprecated.h in Headers */,
    2695526876                                5721A98B1ECE57040081295A /* CryptoAlgorithmRsaPssParams.h in Headers */,
    2695626877                                E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */,
    26957                                 E1BD331C182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParamsDeprecated.h in Headers */,
    2695826878                                E125F82C1822CFEC00D84CD9 /* CryptoAlgorithmSHA1.h in Headers */,
    2695926879                                E19AC3EF1824DC7900349426 /* CryptoAlgorithmSHA224.h in Headers */,
    … …  
    2697526895                                57E657DF1E71373A00F941CA /* CryptoKeyRaw.h in Headers */,
    2697626896                                E164FAA318315BF400DB4E61 /* CryptoKeyRSA.h in Headers */,
    26977                                 E125F856182C0F8300D84CD9 /* CryptoKeySerialization.h in Headers */,
    26978                                 E125F85A182C1AA600D84CD9 /* CryptoKeySerializationRaw.h in Headers */,
    2697926897                                E19727161820549E00592D51 /* CryptoKeyType.h in Headers */,
    2698026898                                E172AF70180F289500FBADB9 /* CryptoKeyUsage.h in Headers */,
    … …  
    2788927807                                975CA2A21303679D00E99AD9 /* JSCrypto.h in Headers */,
    2789027808                                7C9ACAB81F3CF1AE00F3AA09 /* JSCryptoAesKeyAlgorithm.h in Headers */,
    27891                                 E1C657131815F9DD00256CDD /* JSCryptoAlgorithmDictionary.h in Headers */,
    2789227809                                5739E12F1DAC7F7800E14383 /* JSCryptoAlgorithmParameters.h in Headers */,
    2789327810                                7C9ACABA1F3CF1AE00F3AA09 /* JSCryptoEcKeyAlgorithm.h in Headers */,
    … …  
    2789627813                                7C9ACABE1F3CF1AF00F3AA09 /* JSCryptoKeyAlgorithm.h in Headers */,
    2789727814                                E1F80B8E183172B5007885C3 /* JSCryptoKeyPair.h in Headers */,
    27898                                 E125F85218283A5600D84CD9 /* JSCryptoKeySerializationJWK.h in Headers */,
    2789927815                                57D0018D1DD5413200ED19D9 /* JSCryptoKeyUsage.h in Headers */,
    27900                                 E125F83E182411E700D84CD9 /* JSCryptoOperationData.h in Headers */,
    2790127816                                7C9ACAC01F3CF1AF00F3AA09 /* JSCryptoRsaHashedKeyAlgorithm.h in Headers */,
    2790227817                                7C9ACAC21F3CF1AF00F3AA09 /* JSCryptoRsaKeyAlgorithm.h in Headers */,
    … …  
    2856028475                                0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */,
    2856128476                                494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */,
    28562                                 570A99DB1D41A2F3004EC630 /* JSWebKitSubtleCrypto.h in Headers */,
    2856328477                                31C0FF400E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h in Headers */,
    2856428478                                5DA5E0FD102B953800088CF9 /* JSWebSocket.h in Headers */,
    … …  
    3019130105                                A5DEBDA416FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.h in Headers */,
    3019230106                                494BD7950F55C8EE00747828 /* WebKitPoint.h in Headers */,
    30193                                 5709E8CF1D413D9A003244AC /* WebKitSubtleCrypto.h in Headers */,
    3019430107                                31C0FF250E4CEB6E007D6FE5 /* WebKitTransitionEvent.h in Headers */,
    3019530108                                0FCF332F0F2B9A25004B6795 /* WebLayer.h in Headers */,
    … …  
    3103430947                                57E2336B1DCC262400F28D01 /* CryptoKeyRSA.cpp in Sources */,
    3103530948                                E164FAA518315E1A00DB4E61 /* CryptoKeyRSAMac.cpp in Sources */,
    31036                                 E125F859182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp in Sources */,
    3103730949                                316FE1130E6E1DA700BF6088 /* CSSAnimationController.cpp in Sources */,
    3103830950                                31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */,
    … …  
    3187331785                                975CA2A11303679D00E99AD9 /* JSCrypto.cpp in Sources */,
    3187431786                                7C9ACAB71F3CF1AE00F3AA09 /* JSCryptoAesKeyAlgorithm.cpp in Sources */,
    31875                                 E1C657121815F9DD00256CDD /* JSCryptoAlgorithmDictionary.cpp in Sources */,
    3187631787                                5739E1311DAC7FD100E14383 /* JSCryptoAlgorithmParameters.cpp in Sources */,
    3187731788                                7C9ACAB91F3CF1AE00F3AA09 /* JSCryptoEcKeyAlgorithm.cpp in Sources */,
    … …  
    3188031791                                7C9ACABD1F3CF1AE00F3AA09 /* JSCryptoKeyAlgorithm.cpp in Sources */,
    3188131792                                E1F80B8D183172B5007885C3 /* JSCryptoKeyPair.cpp in Sources */,
    31882                                 E125F85118283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp in Sources */,
    3188331793                                57D0018F1DD5415300ED19D9 /* JSCryptoKeyUsage.cpp in Sources */,
    31884                                 E125F83D182411E700D84CD9 /* JSCryptoOperationData.cpp in Sources */,
    3188531794                                7C9ACABF1F3CF1AF00F3AA09 /* JSCryptoRsaHashedKeyAlgorithm.cpp in Sources */,
    3188631795                                7C9ACAC11F3CF1AF00F3AA09 /* JSCryptoRsaKeyAlgorithm.cpp in Sources */,
    … …  
    3258532494                                0FDA7C261883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp in Sources */,
    3258632495                                494BD79D0F55C94C00747828 /* JSWebKitPoint.cpp in Sources */,
    32587                                 570A99DA1D417408004EC630 /* JSWebKitSubtleCrypto.cpp in Sources */,
    32588                                 5709E8CE1D413D5B003244AC /* JSWebKitSubtleCryptoCustom.cpp in Sources */,
    3258932496                                31C0FF3F0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.cpp in Sources */,
    3259032497                                5DA5E0FC102B953800088CF9 /* JSWebSocket.cpp in Sources */,
    … …  
    3391733824                                7C48A6D0191C9D6500026674 /* WebKitNamespace.cpp in Sources */,
    3391833825                                A5DEBDA316FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.cpp in Sources */,
    33919                                 5709E8CD1D413D47003244AC /* WebKitSubtleCrypto.cpp in Sources */,
    3392033826                                31C0FF240E4CEB6E007D6FE5 /* WebKitTransitionEvent.cpp in Sources */,
    3392133827                                0FCF332E0F2B9A25004B6795 /* WebLayer.mm in Sources */,

  • trunk/Source/WebCore/crypto/CryptoAlgorithm.cpp

    r220811 r220941  
    9191}
    9292
    93 ExceptionOr<void> CryptoAlgorithm::encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    94 {
    95     return Exception { NotSupportedError };
    96 }
    97 
    98 ExceptionOr<void> CryptoAlgorithm::decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    99 {
    100     return Exception { NotSupportedError };
    101 }
    102 
    103 ExceptionOr<void> CryptoAlgorithm::sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    104 {
    105     return Exception { NotSupportedError };
    106 }
    107 
    108 ExceptionOr<void> CryptoAlgorithm::verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, const CryptoOperationData&, BoolCallback&&, VoidCallback&&)
    109 {
    110     return Exception { NotSupportedError };
    111 }
    112 
    113 ExceptionOr<void> CryptoAlgorithm::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    114 {
    115     return Exception { NotSupportedError };
    116 }
    117 
    118 ExceptionOr<void> CryptoAlgorithm::generateKey(const CryptoAlgorithmParametersDeprecated&, bool, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&&, ScriptExecutionContext&)
    119 {
    120     return Exception { NotSupportedError };
    121 }
    122 
    123 ExceptionOr<void> CryptoAlgorithm::deriveKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, CryptoAlgorithm*, bool, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&&)
    124 {
    125     return Exception { NotSupportedError };
    126 }
    127 
    128 ExceptionOr<void> CryptoAlgorithm::deriveBits(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, size_t, VectorCallback&&, VoidCallback&&)
    129 {
    130     return Exception { NotSupportedError };
    131 }
    132 
    133 ExceptionOr<void> CryptoAlgorithm::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&&)
    134 {
    135     return Exception { NotSupportedError };
    136 }
    137 
    138 ExceptionOr<void> CryptoAlgorithm::encryptForWrapKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    139 {
    140     return encrypt(parameters, key, data, WTFMove(callback), WTFMove(failureCallback));
    141 }
    142 
    143 ExceptionOr<void> CryptoAlgorithm::decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    144 {
    145     return decrypt(parameters, key, data, WTFMove(callback), WTFMove(failureCallback));
    146 }
    147 
    14893}
    14994

  • trunk/Source/WebCore/crypto/CryptoAlgorithm.h

    r220811 r220941  
    4343
    4444class CryptoAlgorithmParameters;
    45 class CryptoAlgorithmParametersDeprecated;
    4645class CryptoKey;
    4746class CryptoKeyData;
    4847class ScriptExecutionContext;
    49 
    50 // Data is mutable, so async operations should copy it first.
    51 using CryptoOperationData = std::pair<const uint8_t*, size_t>;
    5248
    5349using KeyData = Variant<Vector<uint8_t>, JsonWebKey>;
    … …  
    8278    virtual void unwrapKey(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&);
    8379    virtual ExceptionOr<size_t> getKeyLength(const CryptoAlgorithmParameters&);
    84 
    85     // The following will be deprecated.
    86     virtual ExceptionOr<void> encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    87     virtual ExceptionOr<void> decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    88     virtual ExceptionOr<void> sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    89     virtual ExceptionOr<void> verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback);
    90     virtual ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    91     virtual ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&);
    92     virtual ExceptionOr<void> deriveKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& baseKey, CryptoAlgorithm* derivedKeyType, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback);
    93     virtual ExceptionOr<void> deriveBits(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& baseKey, size_t length, VectorCallback&&, VoidCallback&& failureCallback);
    94     virtual ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback);
    95 
    96     // These are only different from encrypt/decrypt because some algorithms may not expose encrypt/decrypt.
    97     virtual ExceptionOr<void> encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    98     virtual ExceptionOr<void> decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    9980};
    10081

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.cpp

    r220811 r220941  
    3030
    3131#include "CryptoAlgorithmAesCbcCfbParams.h"
    32 #include "CryptoAlgorithmAesCbcParamsDeprecated.h"
    33 #include "CryptoAlgorithmAesKeyGenParamsDeprecated.h"
    3432#include "CryptoAlgorithmAesKeyParams.h"
    3533#include "CryptoKeyAES.h"
    … …  
    5654{
    5755    return s_identifier;
    58 }
    59 
    60 bool CryptoAlgorithmAES_CBC::keyAlgorithmMatches(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKey& key) const
    61 {
    62     if (key.algorithmIdentifier() != s_identifier)
    63         return false;
    64     ASSERT(is<CryptoKeyAES>(key));
    65     return true;
    6656}
    6757
    … …  
    191181}
    192182
    193 ExceptionOr<void> CryptoAlgorithmAES_CBC::encrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    194 {
    195     auto& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParamsDeprecated>(parameters);
    196     if (!keyAlgorithmMatches(aesCBCParameters, key))
    197         return Exception { NotSupportedError };
    198     return platformEncrypt(aesCBCParameters, downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback));
    199 }
    200 
    201 ExceptionOr<void> CryptoAlgorithmAES_CBC::decrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    202 {
    203     auto& aesCBCParameters = downcast<CryptoAlgorithmAesCbcParamsDeprecated>(parameters);
    204     if (!keyAlgorithmMatches(aesCBCParameters, key))
    205         return Exception { NotSupportedError };
    206     return platformDecrypt(aesCBCParameters, downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback));
    207 }
    208 
    209 ExceptionOr<void> CryptoAlgorithmAES_CBC::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext&)
    210 {
    211     auto& aesParameters = downcast<CryptoAlgorithmAesKeyGenParamsDeprecated>(parameters);
    212 
    213     auto result = CryptoKeyAES::generate(CryptoAlgorithmIdentifier::AES_CBC, aesParameters.length, extractable, usages);
    214     if (!result) {
    215         failureCallback();
    216         return { };
    217     }
    218 
    219     callback(WTFMove(result));
    220     return { };
    221 }
    222 
    223 ExceptionOr<void> CryptoAlgorithmAES_CBC::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&&)
    224 {
    225     if (!is<CryptoKeyDataOctetSequence>(keyData))
    226         return Exception { NotSupportedError };
    227     auto& keyDataOctetSequence = downcast<CryptoKeyDataOctetSequence>(keyData);
    228     callback(CryptoKeyAES::create(CryptoAlgorithmIdentifier::AES_CBC, keyDataOctetSequence.octetSequence(), extractable, usage));
    229     return { };
    230 }
    231 
    232183}
    233184

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_CBC.h

    r220811 r220941  
    3232namespace WebCore {
    3333
    34 class CryptoAlgorithmAesCbcParamsDeprecated;
    3534class CryptoKeyAES;
    3635
    … …  
    5251    ExceptionOr<size_t> getKeyLength(const CryptoAlgorithmParameters&) final;
    5352
    54     ExceptionOr<void> encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    55     ExceptionOr<void> decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    56     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    57     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    58 
    59     bool keyAlgorithmMatches(const CryptoAlgorithmAesCbcParamsDeprecated& algorithmParameters, const CryptoKey&) const;
    6053    void platformEncrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    6154    void platformDecrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    62     ExceptionOr<void> platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    63     ExceptionOr<void> platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    6455};
    6556

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.cpp

    r220811 r220941  
    2929#if ENABLE(SUBTLE_CRYPTO)
    3030
    31 #include "CryptoAlgorithmAesKeyGenParamsDeprecated.h"
    3231#include "CryptoAlgorithmAesKeyParams.h"
    3332#include "CryptoKeyAES.h"
    … …  
    5453{
    5554    return s_identifier;
    56 }
    57 
    58 bool CryptoAlgorithmAES_KW::keyAlgorithmMatches(const CryptoKey& key) const
    59 {
    60     if (key.algorithmIdentifier() != s_identifier)
    61         return false;
    62     ASSERT(is<CryptoKeyAES>(key));
    63     return true;
    6455}
    6556
    … …  
    178169}
    179170
    180 ExceptionOr<void> CryptoAlgorithmAES_KW::encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    181 {
    182     if (!keyAlgorithmMatches(key))
    183         return Exception { NotSupportedError };
    184     return platformEncrypt(downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback));
    185 }
    186 
    187 ExceptionOr<void> CryptoAlgorithmAES_KW::decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    188 {
    189     if (!keyAlgorithmMatches(key))
    190         return Exception { NotSupportedError };
    191     return platformDecrypt(downcast<CryptoKeyAES>(key), data, WTFMove(callback), WTFMove(failureCallback));
    192 }
    193 
    194 ExceptionOr<void> CryptoAlgorithmAES_KW::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext&)
    195 {
    196     auto result = CryptoKeyAES::generate(CryptoAlgorithmIdentifier::AES_KW, downcast<CryptoAlgorithmAesKeyGenParamsDeprecated>(parameters).length, extractable, usages);
    197     if (!result) {
    198         failureCallback();
    199         return { };
    200     }
    201 
    202     callback(WTFMove(result));
    203     return { };
    204 }
    205 
    206 ExceptionOr<void> CryptoAlgorithmAES_KW::importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&&)
    207 {
    208     if (!is<CryptoKeyDataOctetSequence>(keyData))
    209         return Exception { NotSupportedError };
    210     callback(CryptoKeyAES::create(CryptoAlgorithmIdentifier::AES_KW, downcast<CryptoKeyDataOctetSequence>(keyData).octetSequence(), extractable, usage));
    211     return { };
    212 }
    213 
    214171}
    215172

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_KW.h

    r220811 r220941  
    5151    ExceptionOr<size_t> getKeyLength(const CryptoAlgorithmParameters&) final;
    5252
    53     ExceptionOr<void> encryptForWrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    54     ExceptionOr<void> decryptForUnwrapKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    55     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    56     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    57 
    58     bool keyAlgorithmMatches(const CryptoKey&) const;
    5953    void platformWrapKey(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&);
    6054    void platformUnwrapKey(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&);
    61     ExceptionOr<void> platformEncrypt(const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    62     ExceptionOr<void> platformDecrypt(const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    6355};
    6456

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp

    r220811 r220941  
    3030
    3131#include "CryptoAlgorithmHmacKeyParams.h"
    32 #include "CryptoAlgorithmHmacKeyParamsDeprecated.h"
    33 #include "CryptoAlgorithmHmacParamsDeprecated.h"
    3432#include "CryptoKeyDataOctetSequence.h"
    3533#include "CryptoKeyHMAC.h"
    … …  
    5755{
    5856    return s_identifier;
    59 }
    60 
    61 bool CryptoAlgorithmHMAC::keyAlgorithmMatches(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKey& key) const
    62 {
    63     if (key.algorithmIdentifier() != s_identifier)
    64         return false;
    65 
    66     if (downcast<CryptoKeyHMAC>(key).hashAlgorithmIdentifier() != parameters.hash)
    67         return false;
    68 
    69     return true;
    7057}
    7158
    … …  
    202189}
    203190
    204 ExceptionOr<void> CryptoAlgorithmHMAC::sign(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    205 {
    206     auto& hmacParameters = downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters);
    207     if (!keyAlgorithmMatches(hmacParameters, key))
    208         return Exception { NotSupportedError };
    209     return platformSign(hmacParameters, downcast<CryptoKeyHMAC>(key), data, WTFMove(callback), WTFMove(failureCallback));
    210 }
    211 
    212 ExceptionOr<void> CryptoAlgorithmHMAC::verify(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback)
    213 {
    214     auto& hmacParameters = downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters);
    215     if (!keyAlgorithmMatches(hmacParameters, key))
    216         return Exception { NotSupportedError };
    217     return platformVerify(hmacParameters, downcast<CryptoKeyHMAC>(key), expectedSignature, data, WTFMove(callback), WTFMove(failureCallback));
    218 }
    219 
    220 ExceptionOr<void> CryptoAlgorithmHMAC::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext&)
    221 {
    222     auto& hmacParameters = downcast<CryptoAlgorithmHmacKeyParamsDeprecated>(parameters);
    223     auto result = CryptoKeyHMAC::generate(hmacParameters.hasLength ? hmacParameters.length : 0, hmacParameters.hash, extractable, usages);
    224     if (!result) {
    225         failureCallback();
    226         return { };
    227     }
    228     callback(WTFMove(result));
    229     return { };
    230 }
    231 
    232 ExceptionOr<void> CryptoAlgorithmHMAC::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&&)
    233 {
    234     if (!is<CryptoKeyDataOctetSequence>(keyData))
    235         return Exception { NotSupportedError };
    236     callback(CryptoKeyHMAC::create(downcast<CryptoKeyDataOctetSequence>(keyData).octetSequence(), downcast<CryptoAlgorithmHmacParamsDeprecated>(parameters).hash, extractable, usage));
    237     return { };
    238 }
    239 
    240191}
    241192

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.h

    r220811 r220941  
    3232namespace WebCore {
    3333
    34 class CryptoAlgorithmHmacParamsDeprecated;
    3534class CryptoKeyHMAC;
    3635
    … …  
    5251    ExceptionOr<size_t> getKeyLength(const CryptoAlgorithmParameters&) final;
    5352
    54     // The following will be deprecated.
    55     ExceptionOr<void> sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    56     ExceptionOr<void> verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback) final;
    57     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    58     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    59 
    60     bool keyAlgorithmMatches(const CryptoAlgorithmHmacParamsDeprecated& algorithmParameters, const CryptoKey&) const;
    6153    void platformSign(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    6254    void platformVerify(Ref<CryptoKey>&&, Vector<uint8_t>&& signature, Vector<uint8_t>&&, BoolCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    63     ExceptionOr<void> platformSign(const CryptoAlgorithmHmacParamsDeprecated&, const CryptoKeyHMAC&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    64     ExceptionOr<void> platformVerify(const CryptoAlgorithmHmacParamsDeprecated&, const CryptoKeyHMAC&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback);
    6555};
    6656

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp

    r220811 r220941  
    3030
    3131#include "CryptoAlgorithmRsaKeyGenParams.h"
    32 #include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
    33 #include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
    3432#include "CryptoKeyDataRSAComponents.h"
    3533#include "CryptoKeyPair.h"
    … …  
    4947{
    5048    return s_identifier;
    51 }
    52 
    53 bool CryptoAlgorithmRSAES_PKCS1_v1_5::keyAlgorithmMatches(const CryptoKey& key) const
    54 {
    55     if (key.algorithmIdentifier() != s_identifier)
    56         return false;
    57     ASSERT(is<CryptoKeyRSA>(key));
    58 
    59     return true;
    6049}
    6150
    … …  
    192181}
    193182
    194 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    195 {
    196     if (!keyAlgorithmMatches(key))
    197         return Exception { NotSupportedError };
    198     return platformEncrypt(downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback));
    199 }
    200 
    201 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    202 {
    203     if (!keyAlgorithmMatches(key))
    204         return Exception { NotSupportedError };
    205     return platformDecrypt(downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback));
    206 }
    207 
    208 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext& context)
    209 {
    210     auto& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
    211     auto keyPairCallback = [capturedCallback = WTFMove(callback)](CryptoKeyPair&& pair) {
    212         capturedCallback(WTFMove(pair));
    213     };
    214     CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback), &context);
    215     return { };
    216 }
    217 
    218 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&& failureCallback)
    219 {
    220     auto& rsaParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
    221     auto& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
    222     auto result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaComponents, extractable, usage);
    223     if (!result) {
    224         failureCallback();
    225         return { };
    226     }
    227     callback(*result);
    228     return { };
    229 }
    230 
    231183}
    232184

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.h

    r220811 r220941  
    5151    void exportKey(CryptoKeyFormat, Ref<CryptoKey>&&, KeyDataCallback&&, ExceptionCallback&&) final;
    5252
    53     ExceptionOr<void> encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    54     ExceptionOr<void> decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    55     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    56     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    57 
    58     bool keyAlgorithmMatches(const CryptoKey&) const;
    5953    void platformEncrypt(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    6054    void platformDecrypt(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    61     ExceptionOr<void> platformEncrypt(const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    62     ExceptionOr<void> platformDecrypt(const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    6355};
    6456

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp

    r220811 r220941  
    3131#include "CryptoAlgorithmRsaHashedImportParams.h"
    3232#include "CryptoAlgorithmRsaHashedKeyGenParams.h"
    33 #include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
    34 #include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
    35 #include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
    3633#include "CryptoKeyDataRSAComponents.h"
    3734#include "CryptoKeyPair.h"
    … …  
    5552{
    5653    return s_identifier;
    57 }
    58 
    59 bool CryptoAlgorithmRSASSA_PKCS1_v1_5::keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParamsDeprecated& algorithmParameters, const CryptoKey& key) const
    60 {
    61     if (key.algorithmIdentifier() != s_identifier)
    62         return false;
    63 
    64     CryptoAlgorithmIdentifier keyHash;
    65     if (downcast<CryptoKeyRSA>(key).isRestrictedToHash(keyHash) && keyHash != algorithmParameters.hash)
    66         return false;
    67 
    68     return true;
    6954}
    7055
    … …  
    245230}
    246231
    247 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::sign(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    248 {
    249     auto& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParamsDeprecated>(parameters);
    250     if (!keyAlgorithmMatches(rsaSSAParameters, key))
    251         return Exception { NotSupportedError };
    252     return platformSign(rsaSSAParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback));
    253 }
    254 
    255 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::verify(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback)
    256 {
    257     auto& rsaSSAParameters = downcast<CryptoAlgorithmRsaSsaParamsDeprecated>(parameters);
    258     if (!keyAlgorithmMatches(rsaSSAParameters, key))
    259         return Exception { NotSupportedError };
    260     return platformVerify(rsaSSAParameters,  downcast<CryptoKeyRSA>(key), signature, data, WTFMove(callback), WTFMove(failureCallback));
    261 }
    262 
    263 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext& context)
    264 {
    265     auto& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
    266     auto keyPairCallback = [capturedCallback = WTFMove(callback)](CryptoKeyPair&& pair) {
    267         capturedCallback(WTFMove(pair));
    268     };
    269     CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback), &context);
    270     return { };
    271 }
    272 
    273 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&& failureCallback)
    274 {
    275     auto& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
    276     auto& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
    277     auto result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSASSA_PKCS1_v1_5, rsaKeyParameters.hash, rsaKeyParameters.hasHash, rsaComponents, extractable, usage);
    278     if (!result) {
    279         failureCallback();
    280         return { };
    281     }
    282     callback(*result);
    283     return { };
    284 }
    285 
    286232}
    287233

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.h

    r220811 r220941  
    3232namespace WebCore {
    3333
    34 class CryptoAlgorithmRsaSsaParamsDeprecated;
    3534class CryptoKeyRSA;
    3635
    … …  
    5150    void exportKey(CryptoKeyFormat, Ref<CryptoKey>&&, KeyDataCallback&&, ExceptionCallback&&) final;
    5251
    53     ExceptionOr<void> sign(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    54     ExceptionOr<void> verify(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback) final;
    55     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    56     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    57 
    58     bool keyAlgorithmMatches(const CryptoAlgorithmRsaSsaParamsDeprecated& algorithmParameters, const CryptoKey&) const;
    5952    void platformSign(Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    6053    void platformVerify(Ref<CryptoKey>&&, Vector<uint8_t>&& signature, Vector<uint8_t>&&, BoolCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    61     ExceptionOr<void> platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    62     ExceptionOr<void> platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData& signature, const CryptoOperationData&, BoolCallback&&, VoidCallback&& failureCallback);
    6354};
    6455

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp

    r220811 r220941  
    3131#include "CryptoAlgorithmRsaHashedImportParams.h"
    3232#include "CryptoAlgorithmRsaHashedKeyGenParams.h"
    33 #include "CryptoAlgorithmRsaKeyGenParamsDeprecated.h"
    34 #include "CryptoAlgorithmRsaKeyParamsWithHashDeprecated.h"
    35 #include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
    3633#include "CryptoKeyDataRSAComponents.h"
    3734#include "CryptoKeyPair.h"
    … …  
    5552{
    5653    return s_identifier;
    57 }
    58 
    59 bool CryptoAlgorithmRSA_OAEP::keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParamsDeprecated& algorithmParameters, const CryptoKey& key) const
    60 {
    61     if (key.algorithmIdentifier() != s_identifier)
    62         return false;
    63 
    64     CryptoAlgorithmIdentifier keyHash;
    65     if (downcast<CryptoKeyRSA>(key).isRestrictedToHash(keyHash) && keyHash != algorithmParameters.hash)
    66         return false;
    67 
    68     return true;
    6954}
    7055
    … …  
    261246}
    262247
    263 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::encrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    264 {
    265     auto& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParamsDeprecated>(parameters);
    266     if (!keyAlgorithmMatches(rsaOAEPParameters, key))
    267         return Exception { NotSupportedError };
    268     return platformEncrypt(rsaOAEPParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback));
    269 }
    270 
    271 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::decrypt(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKey& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    272 {
    273     auto& rsaOAEPParameters = downcast<CryptoAlgorithmRsaOaepParamsDeprecated>(parameters);
    274     if (!keyAlgorithmMatches(rsaOAEPParameters, key))
    275         return Exception { NotSupportedError };
    276     return platformDecrypt(rsaOAEPParameters, downcast<CryptoKeyRSA>(key), data, WTFMove(callback), WTFMove(failureCallback));
    277 }
    278 
    279 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::generateKey(const CryptoAlgorithmParametersDeprecated& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyOrKeyPairCallback&& callback, VoidCallback&& failureCallback, ScriptExecutionContext& context)
    280 {
    281     auto& rsaParameters = downcast<CryptoAlgorithmRsaKeyGenParamsDeprecated>(parameters);
    282     auto keyPairCallback = [capturedCallback = WTFMove(callback)](CryptoKeyPair&& pair) {
    283         capturedCallback(WTFMove(pair));
    284     };
    285     CryptoKeyRSA::generatePair(CryptoAlgorithmIdentifier::RSA_OAEP, rsaParameters.hash, rsaParameters.hasHash, rsaParameters.modulusLength, rsaParameters.publicExponent, extractable, usages, WTFMove(keyPairCallback), WTFMove(failureCallback), &context);
    286     return { };
    287 }
    288 
    289 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::importKey(const CryptoAlgorithmParametersDeprecated& parameters, const CryptoKeyData& keyData, bool extractable, CryptoKeyUsageBitmap usage, KeyCallback&& callback, VoidCallback&& failureCallback)
    290 {
    291     auto& rsaKeyParameters = downcast<CryptoAlgorithmRsaKeyParamsWithHashDeprecated>(parameters);
    292     auto& rsaComponents = downcast<CryptoKeyDataRSAComponents>(keyData);
    293     auto result = CryptoKeyRSA::create(CryptoAlgorithmIdentifier::RSA_OAEP, rsaKeyParameters.hash, rsaKeyParameters.hasHash, rsaComponents, extractable, usage);
    294     if (!result) {
    295         failureCallback();
    296         return { };
    297     }
    298     callback(*result);
    299     return { };
    300 }
    301 
    302248}
    303249

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmRSA_OAEP.h

    r220811 r220941  
    3232namespace WebCore {
    3333
    34 class CryptoAlgorithmRsaOaepParamsDeprecated;
    3534class CryptoKeyRSA;
    3635
    … …  
    5150    void exportKey(CryptoKeyFormat, Ref<CryptoKey>&&, KeyDataCallback&&, ExceptionCallback&&) final;
    5251
    53     ExceptionOr<void> encrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    54     ExceptionOr<void> decrypt(const CryptoAlgorithmParametersDeprecated&, const CryptoKey&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    55     ExceptionOr<void> generateKey(const CryptoAlgorithmParametersDeprecated&, bool extractable, CryptoKeyUsageBitmap, KeyOrKeyPairCallback&&, VoidCallback&& failureCallback, ScriptExecutionContext&) final;
    56     ExceptionOr<void> importKey(const CryptoAlgorithmParametersDeprecated&, const CryptoKeyData&, bool extractable, CryptoKeyUsageBitmap, KeyCallback&&, VoidCallback&& failureCallback) final;
    57 
    58     bool keyAlgorithmMatches(const CryptoAlgorithmRsaOaepParamsDeprecated& algorithmParameters, const CryptoKey&) const;
    5952    void platformEncrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    6053    void platformDecrypt(std::unique_ptr<CryptoAlgorithmParameters>&&, Ref<CryptoKey>&&, Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&);
    61     ExceptionOr<void> platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    62     ExceptionOr<void> platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback);
    6354};
    6455

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp

    r219831 r220941  
    6363}
    6464
    65 ExceptionOr<void> CryptoAlgorithmSHA1::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    66 {
    67     auto digest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_1);
    68     if (!digest) {
    69         failureCallback();
    70         return { };
    71     }
    72     digest->addBytes(data.first, data.second);
    73     callback(digest->computeHash());
    74     return { };
    75 }
    76 
    7765}
    7866

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.h

    r209164 r220941  
    4242    CryptoAlgorithmIdentifier identifier() const final;
    4343    void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&) final;
    44     ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    4544};
    4645

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.cpp

    r219831 r220941  
    6363}
    6464
    65 ExceptionOr<void> CryptoAlgorithmSHA224::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    66 {
    67     auto digest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_224);
    68     if (!digest) {
    69         failureCallback();
    70         return { };
    71     }
    72     digest->addBytes(data.first, data.second);
    73     callback(digest->computeHash());
    74     return { };
    75 }
    76 
    7765}
    7866

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA224.h

    r209164 r220941  
    4242    CryptoAlgorithmIdentifier identifier() const final;
    4343    void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&) final;
    44     ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    4544};
    4645

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.cpp

    r219831 r220941  
    6363}
    6464
    65 ExceptionOr<void> CryptoAlgorithmSHA256::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    66 {
    67     auto digest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_256);
    68     if (!digest) {
    69         failureCallback();
    70         return { };
    71     }
    72     digest->addBytes(data.first, data.second);
    73     callback(digest->computeHash());
    74     return { };
    75 }
    76 
    7765}
    7866

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA256.h

    r209164 r220941  
    4242    CryptoAlgorithmIdentifier identifier() const final;
    4343    void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&) final;
    44     ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    4544};
    4645

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.cpp

    r219831 r220941  
    6363}
    6464
    65 ExceptionOr<void> CryptoAlgorithmSHA384::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    66 {
    67     auto digest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_384);
    68     if (!digest) {
    69         failureCallback();
    70         return { };
    71     }
    72     digest->addBytes(data.first, data.second);
    73     callback(digest->computeHash());
    74     return { };
    75 }
    76 
    7765}
    7866

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA384.h

    r209164 r220941  
    4242    CryptoAlgorithmIdentifier identifier() const final;
    4343    void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&) final;
    44     ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    4544};
    4645

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.cpp

    r219831 r220941  
    6363}
    6464
    65 ExceptionOr<void> CryptoAlgorithmSHA512::digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    66 {
    67     auto digest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_512);
    68     if (!digest) {
    69         failureCallback();
    70         return { };
    71     }
    72     digest->addBytes(data.first, data.second);
    73     callback(digest->computeHash());
    74     return { };
    75 }
    76 
    7765}
    7866

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA512.h

    r209164 r220941  
    4242    CryptoAlgorithmIdentifier identifier() const final;
    4343    void digest(Vector<uint8_t>&&, VectorCallback&&, ExceptionCallback&&, ScriptExecutionContext&, WorkQueue&) final;
    44     ExceptionOr<void> digest(const CryptoAlgorithmParametersDeprecated&, const CryptoOperationData&, VectorCallback&&, VoidCallback&& failureCallback) final;
    4544};
    4645

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp

    r219856 r220941  
    224224}
    225225
    226 ExceptionOr<void> CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    227 {
    228     notImplemented();
    229     return Exception { NotSupportedError };
    230 }
    231 
    232 ExceptionOr<void> CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated&, const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    233 {
    234     notImplemented();
    235     return Exception { NotSupportedError };
    236 }
    237 
    238226} // namespace WebCore
    239227

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp

    r219856 r220941  
    3131
    3232#include "CryptoKeyAES.h"
    33 #include "NotImplemented.h"
    3433#include <pal/crypto/gcrypt/Handle.h>
    3534#include <pal/crypto/gcrypt/Utilities.h>
    … …  
    141140}
    142141
    143 ExceptionOr<void> CryptoAlgorithmAES_KW::platformEncrypt(const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    144 {
    145     notImplemented();
    146     return Exception { NotSupportedError };
    147 }
    148 
    149 ExceptionOr<void> CryptoAlgorithmAES_KW::platformDecrypt(const CryptoKeyAES&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    150 {
    151     notImplemented();
    152     return Exception { NotSupportedError };
    153 }
    154 
    155142} // namespace WebCore
    156143

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp

    r219856 r220941  
    3232#if ENABLE(SUBTLE_CRYPTO)
    3333
    34 #include "CryptoAlgorithmHmacParamsDeprecated.h"
    3534#include "CryptoKeyHMAC.h"
    3635#include "ScriptExecutionContext.h"
    … …  
    8382    signature.resize(digestLength);
    8483    return WTFMove(signature);
    85 }
    86 
    87 static std::optional<Vector<uint8_t>> calculateSignature(int algorithm, const Vector<uint8_t>& key, const CryptoOperationData& data)
    88 {
    89     return calculateSignature(algorithm, key, data.first, data.second);
    9084}
    9185
    … …  
    142136}
    143137
    144 ExceptionOr<void> CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    145 {
    146     int algorithm = getGCryptDigestAlgorithm(parameters.hash);
    147     if (algorithm == GCRY_MAC_NONE)
    148         return Exception { NotSupportedError };
    149 
    150     auto signature = calculateSignature(algorithm, key.key(), data);
    151     if (signature)
    152         callback(*signature);
    153     else
    154         failureCallback();
    155     return { };
    156 }
    157 
    158 ExceptionOr<void> CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback)
    159 {
    160     int algorithm = getGCryptDigestAlgorithm(parameters.hash);
    161     if (algorithm == GCRY_MAC_NONE)
    162         return Exception { NotSupportedError };
    163 
    164     auto signature = calculateSignature(algorithm, key.key(), data);
    165     if (!signature) {
    166         failureCallback();
    167         return { };
    168     }
    169 
    170     // Using a constant time comparison to prevent timing attacks.
    171     bool result = signature.value().size() == expectedSignature.second && !constantTimeMemcmp(signature.value().data(), expectedSignature.first, signature.value().size());
    172 
    173     callback(result);
    174     return { };
    175 }
    176 
    177138}
    178139

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp

    r219856 r220941  
    3131#include "CryptoKeyRSA.h"
    3232#include "GCryptUtilities.h"
    33 #include "NotImplemented.h"
    3433#include "ScriptExecutionContext.h"
    3534
    … …  
    150149}
    151150
    152 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::platformEncrypt(const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    153 {
    154     notImplemented();
    155     return Exception { NotSupportedError };
    156 }
    157 
    158 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::platformDecrypt(const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    159 {
    160     notImplemented();
    161     return Exception { NotSupportedError };
    162 }
    163 
    164151} // namespace WebCore
    165152

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp

    r219856 r220941  
    3030#if ENABLE(SUBTLE_CRYPTO)
    3131
    32 #include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
    3332#include "CryptoKeyRSA.h"
    3433#include "GCryptUtilities.h"
    … …  
    191190}
    192191
    193 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    194 {
    195     notImplemented();
    196     return Exception { NotSupportedError };
    197 }
    198 
    199 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, const CryptoOperationData&, BoolCallback&&, VoidCallback&&)
    200 {
    201     notImplemented();
    202     return Exception { NotSupportedError };
    203 }
    204 
    205192} // namespace WebCore
    206193

  • trunk/Source/WebCore/crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp

    r219856 r220941  
    168168}
    169169
    170 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    171 {
    172     notImplemented();
    173     return Exception { NotSupportedError };
    174 }
    175 
    176 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated&, const CryptoKeyRSA&, const CryptoOperationData&, VectorCallback&&, VoidCallback&&)
    177 {
    178     notImplemented();
    179     return Exception { NotSupportedError };
    180 }
    181 
    182170} // namespace WebCore
    183171

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_CBCMac.cpp

    r219831 r220941  
    3030
    3131#include "CryptoAlgorithmAesCbcCfbParams.h"
    32 #include "CryptoAlgorithmAesCbcParamsDeprecated.h"
    3332#include "CryptoKeyAES.h"
    3433#include "ScriptExecutionContext.h"
    … …  
    115114}
    116115
    117 ExceptionOr<void> CryptoAlgorithmAES_CBC::platformEncrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    118 {
    119     ASSERT(sizeof(parameters.iv) == kCCBlockSizeAES128);
    120     auto result = transformAES_CBC(kCCEncrypt, parameters.iv.data(), key.key(), data.first, data.second);
    121     if (result.hasException()) {
    122         failureCallback();
    123         return { };
    124     }
    125     callback(result.releaseReturnValue());
    126     return { };
    127 }
    128 
    129 ExceptionOr<void> CryptoAlgorithmAES_CBC::platformDecrypt(const CryptoAlgorithmAesCbcParamsDeprecated& parameters, const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    130 {
    131     ASSERT(sizeof(parameters.iv) == kCCBlockSizeAES128);
    132     auto result = transformAES_CBC(kCCDecrypt, parameters.iv.data(), key.key(), data.first, data.second);
    133     if (result.hasException()) {
    134         failureCallback();
    135         return { };
    136     }
    137     callback(result.releaseReturnValue());
    138     return { };
    139 }
    140 
    141116} // namespace WebCore
    142117

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_KWMac.cpp

    r219831 r220941  
    8686}
    8787
    88 ExceptionOr<void> CryptoAlgorithmAES_KW::platformEncrypt(const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    89 {
    90     if (data.second % 8) {
    91         // RFC 3394 uses 64-bit blocks as input.
    92         // <rdar://problem/15949992> CommonCrypto doesn't detect incorrect data length, silently producing a bad cyphertext.
    93         failureCallback();
    94         return { };
    95     }
    96 
    97     auto result = wrapKeyAES_KW(key.key(), data.first, data.second);
    98     if (result.hasException()) {
    99         failureCallback();
    100         return { };
    101     }
    102     callback(result.releaseReturnValue());
    103     return { };
    104 }
    105 
    106 ExceptionOr<void> CryptoAlgorithmAES_KW::platformDecrypt(const CryptoKeyAES& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    107 {
    108     auto result = unwrapKeyAES_KW(key.key(), data.first, data.second);
    109     if (result.hasException()) {
    110         failureCallback();
    111         return { };
    112     }
    113     callback(result.releaseReturnValue());
    114     return { };}
    115 
    11688} // namespace WebCore
    11789

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp

    r219856 r220941  
    2929#if ENABLE(SUBTLE_CRYPTO)
    3030
    31 #include "CryptoAlgorithmHmacParamsDeprecated.h"
    3231#include "CryptoKeyHMAC.h"
    3332#include "ScriptExecutionContext.h"
    … …  
    135134}
    136135
    137 ExceptionOr<void> CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&&)
    138 {
    139     auto algorithm = commonCryptoHMACAlgorithm(parameters.hash);
    140     if (!algorithm)
    141         return Exception { NotSupportedError };
    142     callback(calculateSignature(*algorithm, key.key(), data.first, data.second));
    143     return { };
    144 }
    145 
    146 ExceptionOr<void> CryptoAlgorithmHMAC::platformVerify(const CryptoAlgorithmHmacParamsDeprecated& parameters, const CryptoKeyHMAC& key, const CryptoOperationData& expectedSignature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&&)
    147 {
    148     auto algorithm = commonCryptoHMACAlgorithm(parameters.hash);
    149     if (!algorithm)
    150         return Exception { NotSupportedError };
    151 
    152     auto signature = calculateSignature(*algorithm, key.key(), data.first, data.second);
    153 
    154     // Using a constant time comparison to prevent timing attacks.
    155     bool result = signature.size() == expectedSignature.second && !constantTimeMemcmp(signature.data(), expectedSignature.first, signature.size());
    156 
    157     callback(result);
    158 
    159     return { };
    160 }
    161 
    162136}
    163137

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp

    r219831 r220941  
    104104}
    105105
    106 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::platformEncrypt(const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    107 {
    108     auto result = encryptRSAES_PKCS1_v1_5(key.platformKey(), key.keySizeInBits(), data.first, data.second);
    109     if (result.hasException()) {
    110         failureCallback();
    111         return { };
    112     }
    113     callback(result.releaseReturnValue());
    114     return { };
    115 }
    116 
    117 ExceptionOr<void> CryptoAlgorithmRSAES_PKCS1_v1_5::platformDecrypt(const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    118 {
    119     auto result = decryptRSAES_PKCS1_v1_5(key.platformKey(), key.keySizeInBits(), data.first, data.second);
    120     if (result.hasException()) {
    121         failureCallback();
    122         return { };
    123     }
    124     callback(result.releaseReturnValue());
    125     return { };
    126 }
    127 
    128106} // namespace WebCore
    129107

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp

    r219831 r220941  
    3030
    3131#include "CommonCryptoUtilities.h"
    32 #include "CryptoAlgorithmRsaSsaParamsDeprecated.h"
    3332#include "CryptoDigestAlgorithm.h"
    3433#include "CryptoKeyRSA.h"
    … …  
    134133}
    135134
    136 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::platformSign(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    137 {
    138     auto result = signRSASSA_PKCS1_v1_5(parameters.hash, key.platformKey(), key.keySizeInBits(), data.first, data.second);
    139     if (result.hasException()) {
    140         failureCallback();
    141         return { };
    142     }
    143     callback(result.releaseReturnValue());
    144     return { };
    145 }
    146 
    147 ExceptionOr<void> CryptoAlgorithmRSASSA_PKCS1_v1_5::platformVerify(const CryptoAlgorithmRsaSsaParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& signature, const CryptoOperationData& data, BoolCallback&& callback, VoidCallback&& failureCallback)
    148 {
    149     auto result = verifyRSASSA_PKCS1_v1_5(parameters.hash, key.platformKey(), signature.first, signature.second, data.first, data.second);
    150     if (result.hasException()) {
    151         failureCallback();
    152         return { };
    153     }
    154     callback(result.releaseReturnValue());
    155     return { };
    156 }
    157 
    158135} // namespace WebCore
    159136

  • trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp

    r219831 r220941  
    3131#include "CommonCryptoUtilities.h"
    3232#include "CryptoAlgorithmRsaOaepParams.h"
    33 #include "CryptoAlgorithmRsaOaepParamsDeprecated.h"
    3433#include "CryptoKeyRSA.h"
    3534#include "ScriptExecutionContext.h"
    … …  
    116115}
    117116
    118 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::platformEncrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    119 {
    120     ASSERT(parameters.hasLabel || parameters.label.isEmpty());
    121     auto result = encryptRSA_OAEP(parameters.hash, parameters.label, key.platformKey(), key.keySizeInBits(), data.first, data.second);
    122     if (result.hasException()) {
    123         failureCallback();
    124         return { };
    125     }
    126     callback(result.releaseReturnValue());
    127     return { };
    128 }
    129 
    130 ExceptionOr<void> CryptoAlgorithmRSA_OAEP::platformDecrypt(const CryptoAlgorithmRsaOaepParamsDeprecated& parameters, const CryptoKeyRSA& key, const CryptoOperationData& data, VectorCallback&& callback, VoidCallback&& failureCallback)
    131 {
    132     ASSERT(parameters.hasLabel || parameters.label.isEmpty());
    133     auto result = decryptRSA_OAEP(parameters.hash, parameters.label, key.platformKey(), key.keySizeInBits(), data.first, data.second);
    134     if (result.hasException()) {
    135         failureCallback();
    136         return { };
    137     }
    138     callback(result.releaseReturnValue());
    139     return { };
    140 }
    141 
    142117} // namespace WebCore
    143118

  • trunk/Source/WebCore/features.json

    r220488 r220941  
    590590        "category": "webapps",
    591591        "description": "A JavaScript API for web applications to perform cryptographic operations.",
    592         "comment": "The prefixed ‘webkitSubtle’ attribute which gave access to the SubtleCrypto API is now deprecated in preference to the official “subtle” property.",
    593592        "contact": {
    594593            "name": "Jiewen Tan",

  • trunk/Source/WebCore/page/Crypto.cpp

    r219856 r220941  
    3232#include "Crypto.h"
    3333
     34#include "Document.h"
     35#include "SubtleCrypto.h"
     36#include <runtime/ArrayBufferView.h>
     37#include <wtf/CryptographicallyRandomNumber.h>
     38
    3439#if OS(DARWIN)
    3540#include "CommonCryptoUtilities.h"
    3641#endif
    37 #include "Document.h"
    38 #include "SubtleCrypto.h"
    39 #include "WebKitSubtleCrypto.h"
    40 #include <runtime/ArrayBufferView.h>
    41 #include <wtf/CryptographicallyRandomNumber.h>
    4242
    4343namespace WebCore {
    … …  
    7777}
    7878
    79 ExceptionOr<WebKitSubtleCrypto&> Crypto::webkitSubtle()
    80 {
    81     if (!isMainThread())
    82         return Exception { NotSupportedError };
    83 
    84     if (!m_webkitSubtle) {
    85         m_webkitSubtle = WebKitSubtleCrypto::create(*downcast<Document>(scriptExecutionContext()));
    86         scriptExecutionContext()->addConsoleMessage(MessageSource::Other, MessageLevel::Warning, ASCIILiteral("WebKitSubtleCrypto is deprecated. Please use SubtleCrypto instead."));
    87     }
    88 
    89     return *m_webkitSubtle;
    90 }
    91 
    9279#endif
    9380

  • trunk/Source/WebCore/page/Crypto.h

    r208145 r220941  
    4040
    4141class SubtleCrypto;
    42 class WebKitSubtleCrypto;
    4342
    4443class Crypto : public ContextDestructionObserver, public RefCounted<Crypto> {
    … …  
    5150#if ENABLE(SUBTLE_CRYPTO)
    5251    SubtleCrypto& subtle();
    53 
    54     // Will be deprecated.
    55     ExceptionOr<WebKitSubtleCrypto&> webkitSubtle();
    5652#endif
    5753
    … …  
    6157#if ENABLE(SUBTLE_CRYPTO)
    6258    Ref<SubtleCrypto> m_subtle;
    63 
    64     // Will be deprecated.
    65     RefPtr<WebKitSubtleCrypto> m_webkitSubtle;
    6659#endif
    6760};

  • trunk/Source/WebCore/page/Crypto.idl

    r218960 r220941  
    3434    [Conditional=SUBTLE_CRYPTO] readonly attribute SubtleCrypto subtle;
    3535    [MayThrowException] ArrayBufferView getRandomValues([ReturnValue] ArrayBufferView array);
    36 
    37     // Will be deprecated.
    38     [Conditional=SUBTLE_CRYPTO, GetterMayThrowException] readonly attribute WebKitSubtleCrypto webkitSubtle;
    3936};
Note: See TracChangeset for help on using the changeset viewer.