Skip to content
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

feat(crypto): support importKey in SPKI format #12921

Merged
merged 21 commits into from
Dec 9, 2021
Merged

feat(crypto): support importKey in SPKI format #12921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
157324a
feat(crypto): support `importKey` in SPKI format
yacinehmito Nov 28, 2021
0cae70c
do not throw on empty key usages
yacinehmito Nov 29, 2021
783883c
fix pk_hash mappings
yacinehmito Nov 29, 2021
f1cee55
nit: read length from spki::der
yacinehmito Nov 29, 2021
4f361a3
fix public_key deserialization
yacinehmito Nov 29, 2021
15ce221
enable RSA-related wpt tests
yacinehmito Nov 29, 2021
20a1bb4
embed key kind
yacinehmito Nov 29, 2021
1e3bc0c
Merge branch 'main' into spki
yacinehmito Nov 29, 2021
09280f8
format
yacinehmito Nov 29, 2021
9db6360
fix typo
yacinehmito Nov 29, 2021
09aa223
fix wrong handle for ecdh
yacinehmito Nov 29, 2021
c8de2b1
factor out copy buffer
yacinehmito Nov 29, 2021
6a320f0
add missing label
yacinehmito Nov 29, 2021
6334538
fix typo
yacinehmito Nov 29, 2021
de7d33c
replace kind with type
yacinehmito Nov 29, 2021
052bb9f
review
yacinehmito Nov 30, 2021
5fdcf30
Merge remote-tracking branch 'origin/main' into spki
lucacasonato Dec 9, 2021
0b33cda
use DataError
lucacasonato Dec 9, 2021
f2518e2
more fixes
lucacasonato Dec 9, 2021
cf53603
more fixes
lucacasonato Dec 9, 2021
c6233d6
fmt
lucacasonato Dec 9, 2021
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
156 changes: 156 additions & 0 deletions ext/crypto/00_crypto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,58 @@

return key;
}
case "spki": {
// 1.
if (
ArrayPrototypeFind(
keyUsages,
(u) => !ArrayPrototypeIncludes(["verify"], u),
) !== undefined
) {
throw new DOMException("Invalid key usages", "SyntaxError");
}

if (keyUsages.length == 0) {
throw new DOMException("Key usage is empty", "SyntaxError");
}

// 2-9.
const { modulusLength, publicExponent, data } = await core
.opAsync(
"op_crypto_import_key",
{
algorithm: "RSASSA-PKCS1-v1_5",
format: "spki",
// Needed to perform step 7 without normalization.
hash: normalizedAlgorithm.hash.name,
},
keyData,
);

const handle = {};
WeakMapPrototypeSet(KEY_STORE, handle, {
// PKCS#1 for RSA
type: "raw",
data,
});

const algorithm = {
name: "RSASSA-PKCS1-v1_5",
modulusLength,
publicExponent,
hash: normalizedAlgorithm.hash,
};

const key = constructKey(
"public",
extractable,
usageIntersection(keyUsages, recognisedUsages),
algorithm,
handle,
);

return key;
}
default:
throw new DOMException("Not implemented", "NotSupportedError");
}
Expand Down Expand Up @@ -1172,6 +1224,58 @@

return key;
}
case "spki": {
// 1.
if (
ArrayPrototypeFind(
keyUsages,
(u) => !ArrayPrototypeIncludes(["verify"], u),
) !== undefined
) {
throw new DOMException("Invalid key usages", "SyntaxError");
}

if (keyUsages.length == 0) {
throw new DOMException("Key usage is empty", "SyntaxError");
}

// 2-9.
const { modulusLength, publicExponent, data } = await core
.opAsync(
"op_crypto_import_key",
{
algorithm: "RSA-PSS",
format: "spki",
// Needed to perform step 7 without normalization.
hash: normalizedAlgorithm.hash.name,
},
keyData,
);

const handle = {};
WeakMapPrototypeSet(KEY_STORE, handle, {
// PKCS#1 for RSA
type: "raw",
data,
});

const algorithm = {
name: "RSA-PSS",
modulusLength,
publicExponent,
hash: normalizedAlgorithm.hash,
};

const key = constructKey(
"public",
extractable,
usageIntersection(keyUsages, recognisedUsages),
algorithm,
handle,
);

return key;
}
default:
throw new DOMException("Not implemented", "NotSupportedError");
}
Expand Down Expand Up @@ -1230,6 +1334,58 @@

return key;
}
case "spki": {
// 1.
if (
ArrayPrototypeFind(
keyUsages,
(u) => !ArrayPrototypeIncludes(["encrypt", "wrapKey"], u),
) !== undefined
) {
throw new DOMException("Invalid key usages", "SyntaxError");
}

if (keyUsages.length == 0) {
throw new DOMException("Key usage is empty", "SyntaxError");
}

// 2-9.
const { modulusLength, publicExponent, data } = await core
.opAsync(
"op_crypto_import_key",
{
algorithm: "RSA-OAEP",
format: "spki",
// Needed to perform step 7 without normalization.
hash: normalizedAlgorithm.hash.name,
},
keyData,
);

const handle = {};
WeakMapPrototypeSet(KEY_STORE, handle, {
// PKCS#1 for RSA
type: "raw",
data,
});

const algorithm = {
name: "RSA-OAEP",
modulusLength,
publicExponent,
hash: normalizedAlgorithm.hash,
};

const key = constructKey(
"public",
extractable,
usageIntersection(keyUsages, recognisedUsages),
algorithm,
handle,
);

return key;
}
default:
throw new DOMException("Not implemented", "NotSupportedError");
}
Expand Down
Loading