Skip to content

Correct algorithm parameter types in SubtleCrypto interface #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2016
Merged

Correct algorithm parameter types in SubtleCrypto interface #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions src/main/scala/org/scalajs/dom/crypto/Crypto.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,8 @@ trait SubtleCrypto extends js.Object {
*
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-encrypt ¶14.3.1 The encrypt method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier for the algorithm field.
*/
def encrypt(algorithm: KeyAlgorithmIdentifier, key: CryptoKey,
def encrypt(algorithm: AlgorithmIdentifier, key: CryptoKey,
data: BufferSource): Promise[js.Any] = js.native

/**
Expand All @@ -178,11 +175,8 @@ trait SubtleCrypto extends js.Object {
*
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-decrypt ¶14.3.2 The decrypt method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier for the algorithm field.
*/
def decrypt(algorithm: KeyAlgorithmIdentifier, key: CryptoKey,
def decrypt(algorithm: AlgorithmIdentifier, key: CryptoKey,
data: BufferSource): Promise[js.Any] = js.native

/**
Expand All @@ -191,11 +185,8 @@ trait SubtleCrypto extends js.Object {
*
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-sign ¶14.3.3 The sign method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier for the algorithm field.
*/
def sign(algorithm: KeyAlgorithmIdentifier, key: CryptoKey,
def sign(algorithm: AlgorithmIdentifier, key: CryptoKey,
data: BufferSource): Promise[js.Any] = js.native

/**
Expand All @@ -204,20 +195,19 @@ trait SubtleCrypto extends js.Object {
*
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-verify ¶14.3.4 The verify method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier.
*/
def verify(algorithm: KeyAlgorithmIdentifier, key: CryptoKey,
def verify(algorithm: AlgorithmIdentifier, key: CryptoKey,
signature: BufferSource, data: BufferSource): Promise[js.Any] = js.native

/**
* Returns a Promise of a digest generated from the algorithm and text given
* as parameters. MDN
*
* Defined at [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-digest ¶14.3.5 The digest method]]
* We are a bit more precise than the official definition by requiring a HashAlgorithmIdentifier
* rather than an AlgorithmIdentifier for the algorithm parameter.
*/
def digest(algorithm: AlgorithmIdentifier, data: BufferSource): Promise[js.Any] = js.native
def digest(algorithm: HashAlgorithmIdentifier, data: BufferSource): Promise[js.Any] = js.native

/**
* Returns a Promise of a newly generated CryptoKey, for symmetrical
Expand All @@ -242,10 +232,9 @@ trait SubtleCrypto extends js.Object {
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-deriveKey ¶14.3.7 The deriveKey method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier for the algorithm and derivedKeyType field
* We are being a bit more precise than the official definition by requiring KeyAlgorithmIdentifier for derivedKeyType
*/
def deriveKey(algorithm: KeyAlgorithmIdentifier, baseKey: CryptoKey,
def deriveKey(algorithm: AlgorithmIdentifier, baseKey: CryptoKey,
derivedKeyType: KeyAlgorithmIdentifier, extractable: Boolean,
keyUsages: js.Array[KeyUsage]): Promise[js.Any] = js.native

Expand All @@ -255,11 +244,8 @@ trait SubtleCrypto extends js.Object {
*
* Defined at
* [[http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-deriveBits ¶14.3.8 The deriveBits method]]
*
* We are being a bit more precise than the official definition by requiring a KeyAlgorithmIdentifier
* rather than an AlgorithmIdentifier.
*/
def deriveBits(algorithm: KeyAlgorithmIdentifier, baseKey: CryptoKey,
def deriveBits(algorithm: AlgorithmIdentifier, baseKey: CryptoKey,
length: Double): Promise[js.Any] = js.native

/**
Expand Down Expand Up @@ -435,15 +421,15 @@ object RsaHashedKeyAlgorithm {
}

@js.native
trait RsaHashedImportParams extends HashAlgorithm {
trait RsaHashedImportParams extends KeyAlgorithm {
var hash: HashAlgorithmIdentifier = js.native
}

@js.native
object RsaHashedImportParams {
@inline
def apply(hash: HashAlgorithmIdentifier): RsaHashedImportParams =
js.Dynamic.literal(hash = hash.asInstanceOf[js.Any]).asInstanceOf[RsaHashedImportParams]
def apply(name: String, hash: HashAlgorithmIdentifier): RsaHashedImportParams =
js.Dynamic.literal(name = name, hash = hash.asInstanceOf[js.Any]).asInstanceOf[RsaHashedImportParams]
}

// RSA-PSS
Expand Down Expand Up @@ -850,7 +836,7 @@ object HkdfCtrParams {
// PBKDF2

@js.native
trait Pbkdf2Params extends Algorithm {
trait Pbkdf2Params extends HashAlgorithm {
var salt: BufferSource = js.native

var iterations: Double = js.native
Expand Down