Migrate crypto to dom

armanbilge · armanbilge · commit 558ea0a7ad21 · 2021-09-28T01:27:20.000Z
diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt
diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt
diff --git a/src/main/scala/org/scalajs/dom/AesCbcParams.scala b/src/main/scala/org/scalajs/dom/AesCbcParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // AES-CBC
 
diff --git a/src/main/scala/org/scalajs/dom/AesCfbParams.scala b/src/main/scala/org/scalajs/dom/AesCfbParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // AES-CFB
 
diff --git a/src/main/scala/org/scalajs/dom/AesCmacParams.scala b/src/main/scala/org/scalajs/dom/AesCmacParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // AES-CMAC
 
diff --git a/src/main/scala/org/scalajs/dom/AesCtrParams.scala b/src/main/scala/org/scalajs/dom/AesCtrParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // AES-CTR
 
diff --git a/src/main/scala/org/scalajs/dom/AesDerivedKeyParams.scala b/src/main/scala/org/scalajs/dom/AesDerivedKeyParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait AesDerivedKeyParams extends KeyAlgorithm {
   val length: Int
diff --git a/src/main/scala/org/scalajs/dom/AesGcmParams.scala b/src/main/scala/org/scalajs/dom/AesGcmParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // AES-GCM
 
diff --git a/src/main/scala/org/scalajs/dom/AesKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/AesKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait AesKeyAlgorithm extends KeyAlgorithm {
   val length: Int
diff --git a/src/main/scala/org/scalajs/dom/AesKeyGenParams.scala b/src/main/scala/org/scalajs/dom/AesKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait AesKeyGenParams extends KeyAlgorithm {
   val length: Int
diff --git a/src/main/scala/org/scalajs/dom/Algorithm.scala b/src/main/scala/org/scalajs/dom/Algorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/ConcatParams.scala b/src/main/scala/org/scalajs/dom/ConcatParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // CONCAT
 
diff --git a/src/main/scala/org/scalajs/dom/Crypto.scala b/src/main/scala/org/scalajs/dom/Crypto.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 import scala.scalajs.js.typedarray.ArrayBufferView
diff --git a/src/main/scala/org/scalajs/dom/CryptoKey.scala b/src/main/scala/org/scalajs/dom/CryptoKey.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
diff --git a/src/main/scala/org/scalajs/dom/CryptoKeyPair.scala b/src/main/scala/org/scalajs/dom/CryptoKeyPair.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/DhImportKeyParams.scala b/src/main/scala/org/scalajs/dom/DhImportKeyParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait DhImportKeyParams extends Algorithm {
   val prime: BigInteger
diff --git a/src/main/scala/org/scalajs/dom/DhKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/DhKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait DhKeyAlgorithm extends KeyAlgorithm {
   val prime: BigInteger
diff --git a/src/main/scala/org/scalajs/dom/DhKeyDeriveParams.scala b/src/main/scala/org/scalajs/dom/DhKeyDeriveParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait DhKeyDeriveParams extends Algorithm {
   val public: CryptoKey
diff --git a/src/main/scala/org/scalajs/dom/DhKeyGenParams.scala b/src/main/scala/org/scalajs/dom/DhKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // Diffie-Hellman
 
diff --git a/src/main/scala/org/scalajs/dom/EcKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/EcKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait EcKeyAlgorithm extends KeyAlgorithm {
   val namedCurve: String
diff --git a/src/main/scala/org/scalajs/dom/EcKeyGenParams.scala b/src/main/scala/org/scalajs/dom/EcKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait EcKeyGenParams extends Algorithm {
   val namedCurve: String
diff --git a/src/main/scala/org/scalajs/dom/EcKeyImportParams.scala b/src/main/scala/org/scalajs/dom/EcKeyImportParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait EcKeyImportParams extends KeyAlgorithm {
   val namedCurve: String
diff --git a/src/main/scala/org/scalajs/dom/EcdhKeyDeriveParams.scala b/src/main/scala/org/scalajs/dom/EcdhKeyDeriveParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // ECDH
 
diff --git a/src/main/scala/org/scalajs/dom/EcdsaParams.scala b/src/main/scala/org/scalajs/dom/EcdsaParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // ECDSA
 
diff --git a/src/main/scala/org/scalajs/dom/HashAlgorithm.scala b/src/main/scala/org/scalajs/dom/HashAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 /** A HashAlgorithm type is not defined in the [[http://www.w3.org/TR/WebCryptoAPI/ W3C Web Crypto API]], even though a
   * [[http://www.w3.org/TR/WebCryptoAPI/#key-algorithm-dictionary KeyAlgorithm dictionary]] type is. There are
diff --git a/src/main/scala/org/scalajs/dom/HkdfCtrParams.scala b/src/main/scala/org/scalajs/dom/HkdfCtrParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // HKDF-CTR
 
diff --git a/src/main/scala/org/scalajs/dom/HmacImportParams.scala b/src/main/scala/org/scalajs/dom/HmacImportParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // AES-KW
 
diff --git a/src/main/scala/org/scalajs/dom/HmacKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/HmacKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait HmacKeyAlgorithm extends KeyAlgorithm {
   val hash: HashAlgorithmIdentifier
diff --git a/src/main/scala/org/scalajs/dom/HmacKeyGenParams.scala b/src/main/scala/org/scalajs/dom/HmacKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait HmacKeyGenParams extends KeyAlgorithm {
   val hash: HashAlgorithmIdentifier
diff --git a/src/main/scala/org/scalajs/dom/JsonWebKey.scala b/src/main/scala/org/scalajs/dom/JsonWebKey.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/KeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/KeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 /** The KeyAlgorithm dictionary represents information about the contents of a given CryptoKey object.
   *
diff --git a/src/main/scala/org/scalajs/dom/KeyFormat.scala b/src/main/scala/org/scalajs/dom/KeyFormat.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/KeyType.scala b/src/main/scala/org/scalajs/dom/KeyType.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/KeyUsage.scala b/src/main/scala/org/scalajs/dom/KeyUsage.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/Pbkdf2Params.scala b/src/main/scala/org/scalajs/dom/Pbkdf2Params.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // PBKDF2
 
diff --git a/src/main/scala/org/scalajs/dom/RsaHashedImportParams.scala b/src/main/scala/org/scalajs/dom/RsaHashedImportParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait RsaHashedImportParams extends KeyAlgorithm {
   val hash: HashAlgorithmIdentifier
diff --git a/src/main/scala/org/scalajs/dom/RsaHashedKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/RsaHashedKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 /** see W3C doc
   * [[http://www.w3.org/TR/WebCryptoAPI/#RsaHashedKeyAlgorithm-dictionary 20.6. RsaHashedKeyAlgorithm dictionary]]
diff --git a/src/main/scala/org/scalajs/dom/RsaHashedKeyGenParams.scala b/src/main/scala/org/scalajs/dom/RsaHashedKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait RsaHashedKeyGenParams extends RsaKeyGenParams {
   val hash: HashAlgorithmIdentifier
diff --git a/src/main/scala/org/scalajs/dom/RsaKeyAlgorithm.scala b/src/main/scala/org/scalajs/dom/RsaKeyAlgorithm.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 trait RsaKeyAlgorithm extends KeyAlgorithm {
   val modulusLength: Double
diff --git a/src/main/scala/org/scalajs/dom/RsaKeyGenParams.scala b/src/main/scala/org/scalajs/dom/RsaKeyGenParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // RSASSA-PKCS1-v1_5
 
diff --git a/src/main/scala/org/scalajs/dom/RsaOaepParams.scala b/src/main/scala/org/scalajs/dom/RsaOaepParams.scala
@@ -1,6 +1,4 @@
-package org.scalajs.dom.crypto
-
-import org.scalajs.dom.BufferSource
+package org.scalajs.dom
 
 // RSA-OAEP
 
diff --git a/src/main/scala/org/scalajs/dom/RsaOtherPrimesInfo.scala b/src/main/scala/org/scalajs/dom/RsaOtherPrimesInfo.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/RsaPssParams.scala b/src/main/scala/org/scalajs/dom/RsaPssParams.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
 // RSA-PSS
 
diff --git a/src/main/scala/org/scalajs/dom/SubtleCrypto.scala b/src/main/scala/org/scalajs/dom/SubtleCrypto.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.crypto
+package org.scalajs.dom
 
-import org.scalajs.dom.BufferSource
 import scala.scalajs.js
 
 /** [[http://www.w3.org/TR/WebCryptoAPI/#subtlecrypto-interface w3c ¶14 Subtle Crytpo interface]]
diff --git a/src/main/scala/org/scalajs/dom/crypto/GlobalCrypto.scala b/src/main/scala/org/scalajs/dom/crypto/GlobalCrypto.scala
@@ -3,7 +3,7 @@ package org.scalajs.dom.crypto
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 
-@deprecated("use dom.crypto.crypto instead", "2.0.0")
+@deprecated("use dom.webCrypto instead", "2.0.0")
 @js.native
 @JSGlobalScope
 object GlobalCrypto extends js.Object {
diff --git a/src/main/scala/org/scalajs/dom/crypto/package.scala b/src/main/scala/org/scalajs/dom/crypto/package.scala
diff --git a/src/main/scala/org/scalajs/dom/package.scala b/src/main/scala/org/scalajs/dom/package.scala
diff --git a/tests-shared/src/main/scala/org/scalajs/dom/tests/shared/SharedTests.scala b/tests-shared/src/main/scala/org/scalajs/dom/tests/shared/SharedTests.scala

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.scalajs.dom.crypto`
	`1`	`+package org.scalajs.dom`
`2`	`2`
`3`	`3`	`// AES-CMAC`
`4`	`4`