Skip to content

[v18.x backport] crypto: use WebIDL converters in WebCryptoAPI #46252

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

Closed
panva wants to merge 2 commits into from
Closed

[v18.x backport] crypto: use WebIDL converters in WebCryptoAPI #46252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
842a612
crypto: use WebIDL converters in WebCryptoAPI
panva Jan 17, 2023
b703389
crypto: re-add padding for AES-KW wrapped JWKs
panva Feb 17, 2023
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
Prev Previous commit
crypto: re-add padding for AES-KW wrapped JWKs 
PR-URL: #46563
Reviewed-By: James M Snell <jasnell@gmail.com>
Backport-PR-URL: #46252
  • Loading branch information
@panva
panva committed Apr 18, 2023
commit b703389c0690a253511dba53b30fcd7cced1f642
12 changes: 11 additions & 1 deletion lib/internal/crypto/webcrypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {
ReflectApply,
ReflectConstruct,
SafeSet,
StringPrototypeRepeat,
SymbolToStringTag,
} = primordials;

Expand Down Expand Up @@ -680,7 +681,16 @@ async function wrapKey(format, key, wrappingKey, algorithm) {
let keyData = await ReflectApply(exportKey, this, [format, key]);

if (format === 'jwk') {
keyData = new TextEncoder().encode(JSONStringify(keyData));
const ec = new TextEncoder();
const raw = JSONStringify(keyData);
// As per the NOTE in step 13 https://w3c.github.io/webcrypto/#SubtleCrypto-method-wrapKey
// we're padding AES-KW wrapped JWK to make sure it is always a multiple of 8 bytes
// in length
if (algorithm.name === 'AES-KW' && raw.length % 8 !== 0) {
keyData = ec.encode(raw + StringPrototypeRepeat(' ', 8 - (raw.length % 8)));
} else {
keyData = ec.encode(raw);
}
}

return cipherOrWrap(
Expand Down
13 changes: 6 additions & 7 deletions test/parallel/test-webcrypto-wrap-unwrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ function getFormats(key) {
// material length must be a multiple of 8.
// If the wrapping algorithm is RSA-OAEP, the exported key
// material maximum length is a factor of the modulusLength
//
// As per the NOTE in step 13 https://w3c.github.io/webcrypto/#SubtleCrypto-method-wrapKey
// we're padding AES-KW wrapped JWK to make sure it is always a multiple of 8 bytes
// in length
async function wrappingIsPossible(name, exported) {
if ('byteLength' in exported) {
switch (name) {
Expand All @@ -239,13 +243,8 @@ async function wrappingIsPossible(name, exported) {
case 'RSA-OAEP':
return exported.byteLength <= 446;
}
} else if ('kty' in exported) {
switch (name) {
case 'AES-KW':
return JSON.stringify(exported).length % 8 === 0;
case 'RSA-OAEP':
return JSON.stringify(exported).length <= 478;
}
} else if ('kty' in exported && name === 'RSA-OAEP') {
return JSON.stringify(exported).length <= 478;
}
return true;
}
Expand Down