0.0.9

Author: tamaina

dist/index.cjs

@@ -699,19 +699,19 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/pem/spki.ts
-var import_asn1js2 = __toESM(require("@lapo/asn1js"), 1);
-var import_hex = __toESM(require("@lapo/asn1js/hex.js"), 1);
-var import_base64 = __toESM(require("@lapo/asn1js/base64.js"), 1);
+var import_asn1js2 = require("@lapo/asn1js");
+var import_hex = require("@lapo/asn1js/hex.js");
+var import_base64 = require("@lapo/asn1js/base64.js");
 
 // src/pem/pkcs1.ts
-var import_asn1js = __toESM(require("@lapo/asn1js"), 1);
+var import_asn1js = require("@lapo/asn1js");
 var Pkcs1ParseError = class extends Error {
   constructor(message) {
     super(message);
   }
 };
 function parsePkcs1(input) {
-  const parsed = import_asn1js.default.decode(decodePem(input));
+  const parsed = import_asn1js.ASN1.decode(decodePem(input));
   if (!parsed.sub || parsed.sub.length !== 2)
     throw new Pkcs1ParseError("Invalid SPKI (invalid sub length)");
   const modulus = parsed.sub[0];
@@ -917,7 +917,7 @@ function asn1ToArrayBuffer(asn1, contentOnly = false) {
 }
 var reHex = /^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/;
 function decodePem(input) {
-  const der = typeof input === "string" ? reHex.test(input) ? import_hex.default.decode(input) : import_base64.default.unarmor(input) : input;
+  const der = typeof input === "string" ? reHex.test(input) ? import_hex.Hex.decode(input) : import_base64.Base64.unarmor(input) : input;
   return der;
 }
 function parseAlgorithmIdentifier(input) {
@@ -940,7 +940,7 @@ function parseAlgorithmIdentifier(input) {
   };
 }
 function parseSpki(input) {
-  const parsed = import_asn1js2.default.decode(decodePem(input));
+  const parsed = import_asn1js2.ASN1.decode(decodePem(input));
   if (!parsed.sub || parsed.sub.length === 0 || parsed.sub.length > 2)
     throw new SpkiParseError("Invalid SPKI (invalid sub)");
   return {
@@ -1833,14 +1833,14 @@ async function verifyDigestHeader(request, rawBody, opts = {
 }
 
 // src/pem/pkcs8.ts
-var import_asn1js3 = __toESM(require("@lapo/asn1js"), 1);
+var import_asn1js3 = require("@lapo/asn1js");
 var Pkcs8ParseError = class extends Error {
   constructor(message) {
     super(message);
   }
 };
 function parsePkcs8(input) {
-  const parsed = import_asn1js3.default.decode(decodePem(input));
+  const parsed = import_asn1js3.ASN1.decode(decodePem(input));
   if (!parsed.sub || parsed.sub.length < 3 || parsed.sub.length > 4)
     throw new Pkcs8ParseError("Invalid PKCS#8 (invalid sub length)");
   const version = parsed.sub[0];

dist/index.mjs

@@ -596,12 +596,12 @@ var require_dist = __commonJS({
 });
 
 // src/pem/spki.ts
-import ASN12 from "@lapo/asn1js";
-import Hex from "@lapo/asn1js/hex.js";
-import Base64 from "@lapo/asn1js/base64.js";
+import { ASN1 as ASN12 } from "@lapo/asn1js";
+import { Hex } from "@lapo/asn1js/hex.js";
+import { Base64 } from "@lapo/asn1js/base64.js";
 
 // src/pem/pkcs1.ts
-import ASN1 from "@lapo/asn1js";
+import { ASN1 } from "@lapo/asn1js";
 var Pkcs1ParseError = class extends Error {
   constructor(message) {
     super(message);
@@ -1730,7 +1730,7 @@ async function verifyDigestHeader(request, rawBody, opts = {
 }
 
 // src/pem/pkcs8.ts
-import ASN13 from "@lapo/asn1js";
+import { ASN1 as ASN13 } from "@lapo/asn1js";
 var Pkcs8ParseError = class extends Error {
   constructor(message) {
     super(message);

dist/pem/pkcs1.d.ts

@@ -1,4 +1,4 @@
-import ASN1 from '@lapo/asn1js';
+import { ASN1 } from '@lapo/asn1js';
 export declare class Pkcs1ParseError extends Error {
     constructor(message: string);
 }

dist/pem/pkcs8.d.ts

@@ -1,4 +1,4 @@
-import ASN1 from '@lapo/asn1js';
+import { ASN1 } from '@lapo/asn1js';
 import { ParsedAlgorithmIdentifierBase } from './spki.js';
 import { SignInfoDefaults } from '../utils.js';
 export declare class Pkcs8ParseError extends Error {

dist/pem/spki.d.ts

@@ -1,4 +1,4 @@
-import ASN1 from '@lapo/asn1js';
+import { ASN1 } from '@lapo/asn1js';
 import { ECNamedCurve, KeyAlgorithmName } from '../types.js';
 import { SignInfoDefaults } from '../utils.js';
 export declare class SpkiParseError extends Error {
@@ -109,7 +109,7 @@ export declare function importPublicKey(key: ASN1.StreamOrBinary, keyUsages?: Ke
  * @returns
  */
 export declare function parseAndImportPublicKey(source: ASN1.StreamOrBinary | CryptoKey, keyUsages?: KeyUsage[], providedAlgorithm?: string, errorLogger?: ((message: any) => any)): Promise<{
-    publicKey: CryptoKey;
+    publicKey: any;
     algorithm: {
         name: string;
         hash: import("../types.js").SignatureHashAlgorithmUpperSnake;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misskey-dev/node-http-message-signatures",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "type": "module",
   "engines": {
@@ -55,7 +55,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@lapo/asn1js": "^1.2.4",
+    "@lapo/asn1js": "^2.0.4",
     "rfc4648": "^1.5.3",
     "structured-headers": "^1.0.1"
   },
@@ -67,7 +67,6 @@
     "@swc/core": "^1.4.2",
     "@swc/jest": "^0.2.36",
     "@types/jest": "^29.5.12",
-    "@types/lapo__asn1js": "^1.2.5",
     "@types/node": "^20.11.20",
     "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",

pnpm-lock.yaml

@@ -1,4 +1,5 @@
-import ASN1 from '@lapo/asn1js';
+//@ts-expect-error 2317
+import { ASN1 } from '@lapo/asn1js';
 import { asn1ToArrayBuffer, decodePem } from './spki.js';
 import { genASN1Length } from '../utils.js';
 

src/pem/pkcs1.ts

@@ -1,4 +1,5 @@
-import ASN1 from '@lapo/asn1js';
+//@ts-expect-error 2317
+import { ASN1 } from '@lapo/asn1js';
 import { ParsedAlgorithmIdentifierBase, asn1ToArrayBuffer, decodePem, parseAlgorithmIdentifier } from './spki.js';
 import { SignInfoDefaults, defaultSignInfoDefaults, genSignInfo, getWebcrypto } from '../utils.js';
 

src/pem/pkcs8.ts

@@ -1,6 +1,7 @@
-import ASN1 from '@lapo/asn1js';
-import Hex from '@lapo/asn1js/hex.js';
-import Base64 from '@lapo/asn1js/base64.js';
+//@ts-expect-error 2317
+import { ASN1 } from '@lapo/asn1js';
+import { Hex } from '@lapo/asn1js/hex.js';
+import { Base64 } from '@lapo/asn1js/base64.js';
 import { genSpkiFromPkcs1, parsePkcs1 } from './pkcs1.js';
 import { ECNamedCurve, KeyAlgorithmName } from '../types.js';
 import { SignInfoDefaults, defaultSignInfoDefaults, genAlgorithmForSignAndVerify, genSignInfo, getWebcrypto } from '../utils.js';