@fedify/fedify 1.5.0-dev.653 → 1.5.0-dev.654

package/CHANGES.md

@@ -8,6 +8,16 @@ Version 1.5.0
 
 To be released.
 
+ -  Fedify now accepts PEM-PKCS#1 besides PEM-SPKI for RSA public keys.
+    [[#209]]
+
+     -  `CryptographicKey` now can contain a `publicKey` with a PEM-PKCS#1
+        format (in addition to PEM-SPKI).
+     -  Added `importPkcs1()` function.
+     -  Added `importPem()` function.
+
+[#209]: https://github.com/fedify-dev/fedify/issues/209
+
 
 Version 1.4.1
 -------------

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@fedify/fedify",
-    "version": "1.5.0-dev.653+1d000223",
+    "version": "1.5.0-dev.654+b5166915",
     "license": "MIT",
     "exports": {
         ".": "./mod.ts",

package/esm/runtime/key.js

@@ -1,5 +1,4 @@
 import * as dntShim from "../_dnt.shims.js";
-import { createPublicKey } from "node:crypto";
 import { concat } from "../deps/jsr.io/@std/bytes/1.0.5/concat.js";
 import { decodeBase64, encodeBase64 } from "../deps/jsr.io/@std/encoding/1.0.7/base64.js";
 import { decodeBase64Url } from "../deps/jsr.io/@std/encoding/1.0.7/base64url.js";
@@ -7,6 +6,7 @@ import { decodeHex } from "../deps/jsr.io/@std/encoding/1.0.7/hex.js";
 import { Integer, Sequence } from "asn1js";
 import { decode, encode } from "multibase";
 import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";
+import { createPublicKey } from "node:crypto";
 import { PublicKeyInfo } from "pkijs";
 import { validateCryptoKey } from "../sig/key.js";
 const algorithms = {
@@ -51,6 +51,29 @@ export async function exportSpki(key) {
     pem = (pem.match(/.{1,64}/g) || []).join("\n");
     return `-----BEGIN PUBLIC KEY-----\n${pem}\n-----END PUBLIC KEY-----\n`;
 }
+/**
+ * Imports a PEM-PKCS#1 formatted public key.
+ * @param pem The PEM-PKCS#1 formatted public key.
+ * @returns The imported public key.
+ * @throws {TypeError} If the key is invalid or unsupported.
+ * @since 1.5.0
+ */
+export function importPkcs1(pem) {
+    const key = createPublicKey({ key: pem, format: "pem", type: "pkcs1" });
+    const spki = key.export({ type: "spki", format: "pem" });
+    return importSpki(spki);
+}
+const PKCS1_HEADER = /^\s*-----BEGIN\s+RSA\s+PUBLIC\s+KEY-----\s*\n/;
+/**
+ * Imports a PEM formatted public key (SPKI or PKCS#1).
+ * @param pem The PEM formatted public key to import (SPKI or PKCS#1).
+ * @returns The imported public key.
+ * @throws {TypeError} If the key is invalid or unsupported.
+ * @since 1.5.0
+ */
+export function importPem(pem) {
+    return PKCS1_HEADER.test(pem) ? importPkcs1(pem) : importSpki(pem);
+}
 /**
  * Imports a [Multibase]-encoded public key.
  *
@@ -126,3 +149,4 @@ export async function exportMultibaseKey(key) {
     const encoded = encode("base58btc", prefixed);
     return new TextDecoder().decode(encoded);
 }
+// cSpell: ignore multicodec pkijs