Skip to content

fix(crypto): Fix bug in canOnlySignOrVerify logic. Current version checks for sign|verify, but not exclusively those flags #332

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
andreiltd merged 3 commits into from
Oct 22, 2026
Merged

fix(crypto): Fix bug in canOnlySignOrVerify logic. Current version checks for sign|verify, but not exclusively those flags #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1e3162
Fix bug in canOnlySignOrVerify logic. Current version checks for sign…
VirtualTim Oct 20, 2026
fbe1881
Merge branch 'main' into canOnlySignOrVerify
VirtualTim Oct 22, 2026
304c251
Regenerate test expectations.
VirtualTim Oct 22, 2026
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
5 changes: 4 additions & 1 deletion builtins/web/crypto/crypto-key.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ class CryptoKeyUsages {
[[nodiscard]] bool canOnlyDecrypt() const { return this->mask == decrypt_flag; };
[[nodiscard]] bool canOnlySign() const { return this->mask == sign_flag; };
[[nodiscard]] bool canOnlyVerify() const { return this->mask == verify_flag; };
[[nodiscard]] bool canOnlySignOrVerify() const { return (this->mask & (sign_flag | verify_flag)) != 0; };
[[nodiscard]] bool canOnlySignOrVerify() const {
return this->mask == sign_flag || this->mask == verify_flag ||
this->mask == (sign_flag | verify_flag);
};
[[nodiscard]] bool canOnlyDeriveKey() const { return this->mask == derive_key_flag; };
[[nodiscard]] bool canOnlyDeriveBits() const { return this->mask == derive_bits_flag; };
[[nodiscard]] bool canOnlyWrapKey() const { return this->mask == wrap_key_flag; };
Expand Down
13 changes: 13 additions & 0 deletions tests/integration/crypto/crypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,19 @@ export const handler = serveTest(async (t) => {
deepStrictEqual(key.usages, ["sign", "verify"], `key.usages`);
}
});
await t.test("subtle.importKey.HMAC-non-sign-or-verify-usage", async () => {
for (const usages of [[], ["encrypt"], ["sign", "encrypt"], ["verify", "deriveBits"]]) {
await rejects(async () => {
await crypto.subtle.importKey(
"raw",
new Uint8Array([1, 0, 1]),
{ name: "HMAC", hash: "SHA-256" },
false,
usages,
);
}, DOMException, undefined, "SyntaxError");
}
});
await t.test("subtle.importKey.JWK-HS256-Public", async () => {
const key = await crypto.subtle.importKey(
"jwk",
Expand Down
16 changes: 8 additions & 8 deletions .../expectations/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,16 +2136,16 @@
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), Ed25519, true, [sign])": {
"status": "FAIL"
"status": "PASS"
Comment thread
andreiltd marked this conversation as resolved.
},
"Missing JWK 'kty' parameter: importKey(jwk(private), Ed25519, false, [sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), Ed25519, true, [sign, sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), Ed25519, false, [sign, sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'crv' parameter: importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "PASS"
Expand All @@ -2172,16 +2172,16 @@
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'kty' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign, sign])": {
"status": "FAIL"
"status": "PASS"
},
"Missing JWK 'crv' parameter: importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "PASS"
Expand Down
Loading