foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/crypto): exportKey() for HMAC (#11737)

Browse source 
Fixes typings and innerKey processing (WPT doesn't test 
exportKey for HMAC so this wasn't caught earlier).
This commit is contained in:
Divy Srivastava 2021-08-17 14:59:32 +05:30 • committed by GitHub
parent c67f6c13cd
commit af97535b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/tests/unit/webcrypto_test.ts
View file

@ -160,7 +160,7 @@ unitTest(async function testSignRSASSAKey() {
assert(signature); assert(signature);
}); });
unitTest(async function subtleCryptoHmacImport() { unitTest(async function subtleCryptoHmacImportExport() {
// deno-fmt-ignore // deno-fmt-ignore
const rawKey = new Uint8Array([ const rawKey = new Uint8Array([
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
@ -189,4 +189,7 @@ unitTest(async function subtleCryptoHmacImport() {
new Uint8Array(actual), new Uint8Array(actual),
expected, expected,
); );
const exportedKey = await crypto.subtle.exportKey("raw", key);
assertEquals(new Uint8Array(exportedKey), rawKey);
}); });

5
ext/crypto/00_crypto.js
View file

@ -577,16 +577,17 @@
const handle = key[_handle]; const handle = key[_handle];
// 2. // 2.
const bits = WeakMapPrototypeGet(KEY_STORE, handle); const innerKey = WeakMapPrototypeGet(KEY_STORE, handle);
switch (key[_algorithm].name) { switch (key[_algorithm].name) {
case "HMAC": { case "HMAC": {
if (bits == null) { if (innerKey == null) {
throw new DOMException("Key is not available", "OperationError"); throw new DOMException("Key is not available", "OperationError");
} }
switch (format) { switch (format) {
// 3. // 3.
case "raw": { case "raw": {
const bits = innerKey.data;
for (let _i = 7 & (8 - bits.length % 8); _i > 0; _i--) { for (let _i = 7 & (8 - bits.length % 8); _i > 0; _i--) {
bits.push(0); bits.push(0);
} }

1
ext/crypto/lib.deno_crypto.d.ts vendored
View file

@ -107,6 +107,7 @@ interface SubtleCrypto {
extractable: boolean, extractable: boolean,
keyUsages: KeyUsage[], keyUsages: KeyUsage[],
): Promise<CryptoKey>; ): Promise<CryptoKey>;
exportKey(format: "raw", key: CryptoKey): Promise<ArrayBuffer>;
sign( sign(
algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams, algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams,
key: CryptoKey, key: CryptoKey,