foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-11 16:42:21 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): support spki format in createPublicKey (#22918)

Browse source
This commit is contained in:
Divy Srivastava 2024-03-14 06:39:46 -07:00 committed by GitHub
parent cf3c6f9b08
commit 9c348a0acd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ext/node/ops/crypto/mod.rs
View file

@ -1480,14 +1480,11 @@ fn parse_public_key(
} }
Ok(doc) Ok(doc)
} }
"der" => { "der" => match type_ {
match type_ {
"pkcs1" => pkcs8::Document::from_pkcs1_der(key) "pkcs1" => pkcs8::Document::from_pkcs1_der(key)
.map_err(|_| type_error("Invalid PKCS1 public key")), .map_err(|_| type_error("Invalid PKCS1 public key")),
// TODO(@iuioiua): spki type
_ => Err(type_error(format!("Unsupported key type: {}", type_))), _ => Err(type_error(format!("Unsupported key type: {}", type_))),
} },
}
_ => Err(type_error(format!("Unsupported key format: {}", format))), _ => Err(type_error(format!("Unsupported key format: {}", format))),
} }
} }
@ -1499,8 +1496,14 @@ pub fn op_node_create_public_key(
#[string] format: &str, #[string] format: &str,
#[string] type_: &str, #[string] type_: &str,
) -> Result<AsymmetricKeyDetails, AnyError> { ) -> Result<AsymmetricKeyDetails, AnyError> {
let doc = parse_public_key(key, format, type_)?; let mut doc = None;
let pk_info = spki::SubjectPublicKeyInfoRef::try_from(doc.as_bytes())?;
let pk_info = if type_ != "spki" {
doc.replace(parse_public_key(key, format, type_)?);
spki::SubjectPublicKeyInfoRef::try_from(doc.as_ref().unwrap().as_bytes())?
} else {
spki::SubjectPublicKeyInfoRef::try_from(key)?
};
let alg = pk_info.algorithm.oid; let alg = pk_info.algorithm.oid;

2
ext/node/polyfills/internal/crypto/keys.ts
View file

@ -66,7 +66,7 @@ export const getArrayBufferOrView = hideStackFrames(
| Uint16Array | Uint16Array
| Uint32Array => { | Uint32Array => {
if (isAnyArrayBuffer(buffer)) { if (isAnyArrayBuffer(buffer)) {
return buffer; return new Uint8Array(buffer);
} }
if (typeof buffer === "string") { if (typeof buffer === "string") {
if (encoding === "buffer") { if (encoding === "buffer") {

29
tests/unit_node/crypto/crypto_key_test.ts
View file

@ -284,3 +284,32 @@ Deno.test("createPublicKey() EC", function () {
assertEquals(key.asymmetricKeyType, "ec"); assertEquals(key.asymmetricKeyType, "ec");
assertEquals(key.asymmetricKeyDetails?.namedCurve, "p256"); assertEquals(key.asymmetricKeyDetails?.namedCurve, "p256");
}); });
Deno.test("createPublicKey SPKI for DH", async function () {
const { publicKey, privateKey } = await crypto.subtle.generateKey(
{
name: "ECDH",
namedCurve: "P-384",
},
true,
["deriveKey", "deriveBits"],
);
const exportedPublicKey = await crypto.subtle.exportKey("spki", publicKey);
const exportedPrivateKey = await crypto.subtle.exportKey("pkcs8", privateKey);
const pubKey = createPublicKey({
key: Buffer.from(exportedPublicKey),
format: "der",
type: "spki",
});
const privKey = createPrivateKey({
key: Buffer.from(exportedPrivateKey),
format: "der",
type: "pkcs8",
});
assertEquals(pubKey.asymmetricKeyType, "ec");
assertEquals(privKey.asymmetricKeyType, "ec");
});