CryptographicKey now can contain PEM-PKCS#1 key

Close #209
fedify-dev · Feb 18, 2025 · b516691 · b516691
1 parent 5609c37
commit b516691
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,8 @@ 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.
 

diff --git a/src/codegen/__snapshots__/class.test.ts.snap b/src/codegen/__snapshots__/class.test.ts.snap
@@ -15,7 +15,7 @@ import { decode as decodeMultibase, encode as encodeMultibase }
 import {
     exportSpki,
     exportMultibaseKey,
-    importSpki,
+    importPem,
     importMultibaseKey,
   } from \\"../runtime/key.ts\\";
 import { LanguageString } from \\"../runtime/langstr.ts\\";
@@ -15371,7 +15371,7 @@ owner?: Application | Group | Organization | Person | Service | URL | null;publi
         : _2fE2QMDdg6KFGqa4NEC3TmjApSAD_publicKeyPem__array
     ) {
       if (v == null) continue;
-    _2fE2QMDdg6KFGqa4NEC3TmjApSAD_publicKeyPem.push(await importSpki(v[\\"@value\\"]))
+    _2fE2QMDdg6KFGqa4NEC3TmjApSAD_publicKeyPem.push(await importPem(v[\\"@value\\"]))
     }
     instance.#_2fE2QMDdg6KFGqa4NEC3TmjApSAD_publicKeyPem = _2fE2QMDdg6KFGqa4NEC3TmjApSAD_publicKeyPem;
 

diff --git a/src/codegen/class.ts b/src/codegen/class.ts
@@ -118,7 +118,7 @@ export async function* generateClasses(
   yield `import {
     exportSpki,
     exportMultibaseKey,
-    importSpki,
+    importPem,
     importMultibaseKey,
   } from "${runtimePath}/key.ts";\n`;
   yield `import { LanguageString } from "${runtimePath}/langstr.ts";\n`;

diff --git a/src/codegen/type.ts b/src/codegen/type.ts
@@ -313,7 +313,7 @@ const scalarTypes: Record<string, ScalarType> = {
         && typeof ${v}["@value"] === "string"`;
     },
     decoder(v) {
-      return `await importSpki(${v}["@value"])`;
+      return `await importPem(${v}["@value"])`;
     },
   },
   "fedify:multibaseKey": {