Skip to content

Commit fec5ef8

Browse files
authored
Merge pull request #740 from zetashift/fix/#739
`SubtleCrypto#deriveBits` should return a `Promise[ArrayBuffer]`
2 parents 714813e + e235a70 commit fec5ef8

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

api-reports/2_12.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25158,7 +25158,7 @@ StyleSheetList[JC] def item(index: Int): StyleSheet
2515825158
StyleSheetList[JC] def length: Int
2515925159
StyleSheetList[JC] @scala.scalajs.js.annotation.JSBracketAccess def update(index: Int, v: StyleSheet): Unit
2516025160
SubtleCrypto[JT] def decrypt(algorithm: AlgorithmIdentifier, key: CryptoKey, data: BufferSource): js.Promise[js.Any]
25161-
SubtleCrypto[JT] def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, length: Double): js.Promise[js.Any]
25161+
SubtleCrypto[JT] def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, length: Double): js.Promise[ArrayBuffer]
2516225162
SubtleCrypto[JT] def deriveKey(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, derivedKeyType: KeyAlgorithmIdentifier, extractable: Boolean, keyUsages: js.Array[KeyUsage]): js.Promise[js.Any]
2516325163
SubtleCrypto[JT] def digest(algorithm: HashAlgorithmIdentifier, data: BufferSource): js.Promise[js.Any]
2516425164
SubtleCrypto[JT] def encrypt(algorithm: AlgorithmIdentifier, key: CryptoKey, data: BufferSource): js.Promise[js.Any]

api-reports/2_13.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25158,7 +25158,7 @@ StyleSheetList[JC] def item(index: Int): StyleSheet
2515825158
StyleSheetList[JC] def length: Int
2515925159
StyleSheetList[JC] @scala.scalajs.js.annotation.JSBracketAccess def update(index: Int, v: StyleSheet): Unit
2516025160
SubtleCrypto[JT] def decrypt(algorithm: AlgorithmIdentifier, key: CryptoKey, data: BufferSource): js.Promise[js.Any]
25161-
SubtleCrypto[JT] def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, length: Double): js.Promise[js.Any]
25161+
SubtleCrypto[JT] def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, length: Double): js.Promise[ArrayBuffer]
2516225162
SubtleCrypto[JT] def deriveKey(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, derivedKeyType: KeyAlgorithmIdentifier, extractable: Boolean, keyUsages: js.Array[KeyUsage]): js.Promise[js.Any]
2516325163
SubtleCrypto[JT] def digest(algorithm: HashAlgorithmIdentifier, data: BufferSource): js.Promise[js.Any]
2516425164
SubtleCrypto[JT] def encrypt(algorithm: AlgorithmIdentifier, key: CryptoKey, data: BufferSource): js.Promise[js.Any]

dom/src/main/scala/org/scalajs/dom/SubtleCrypto.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.scalajs.dom
22

33
import scala.scalajs.js
4+
import scala.scalajs.js.typedarray.ArrayBuffer
45

56
/** [[http://www.w3.org/TR/WebCryptoAPI/#subtlecrypto-interface w3c ¶14 Subtle Crytpo interface]]
67
*
@@ -72,7 +73,8 @@ trait SubtleCrypto extends js.Object {
7273
*
7374
* Defined at [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-deriveBits ¶14.3.8 The deriveBits method]]
7475
*/
75-
def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey, length: Double): js.Promise[js.Any] = js.native
76+
def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey,
77+
length: Double): js.Promise[ArrayBuffer] = js.native
7678

7779
/** Returns a Promise of a CryptoKey corresponding to the format, the algorithm, the raw key data, the usages and the
7880
* extractability given as parameters.

0 commit comments

Comments
 (0)