@super-protocol/pki-common 1.6.6 → 1.7.2

package/dist/helpers.d.ts

@@ -1,19 +1,21 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Challenge, ChallengeType, ChallengeWithNvidiaToken, IntermediateCertificates, KeyPairPem, TeeSslCertificate } from './types';
-import * as forge from 'node-forge';
+import { KeyObject } from 'crypto';
 export declare const binaryIdToDomainName: (binaryId: Buffer) => string;
 export declare const generateDomain: (baseDomain: string, challengeType: ChallengeType, binaryId: Buffer) => string;
 export declare const getPublicKeyFromPrivate: (privateKeyPem: string) => string;
 export declare const getPublicKeyPemHash: (publicKeyPem: string) => Buffer;
-export declare const getPublicKeyHash: (publicKey: forge.pki.PublicKey) => Buffer;
-export declare const getPublicKeyDigestRaw: (publicKeyPem: string) => forge.md.sha256.MessageDigest;
-export declare const generateKeyPair: () => KeyPairPem;
+export declare const getPublicKeyHash: (publicKey: KeyObject) => Buffer;
+export declare const generateEcKeyPair: () => KeyPairPem;
+export declare const generateRsaKeyPair: () => KeyPairPem;
 export declare const getPublicKeyFromCsr: (csrPem: string) => string;
 export declare const splitCerts: (certsPem: string) => string[];
-export declare const extractCommonName: (certPem: string) => string | undefined;
+export declare const extractCommonNameFromSubject: (subject: string) => string | undefined;
 export declare const extractIntermediateCertificates: {
     (certs: TeeSslCertificate): IntermediateCertificates;
     (certsChain: string): IntermediateCertificates;
 };
 export declare const hasChallengeNvidiaToken: (challenge: Challenge) => challenge is Required<ChallengeWithNvidiaToken>;
 export declare const isFileExisted: (filePath: string) => Promise<boolean>;
+export declare const compareKeys: (keyPemOne: string, keyPemTwo: string) => boolean;

package/dist/helpers.js

@@ -23,46 +23,57 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFileExisted = exports.hasChallengeNvidiaToken = exports.extractIntermediateCertificates = exports.extractCommonName = exports.splitCerts = exports.getPublicKeyFromCsr = exports.generateKeyPair = exports.getPublicKeyDigestRaw = exports.getPublicKeyHash = exports.getPublicKeyPemHash = exports.getPublicKeyFromPrivate = exports.generateDomain = exports.binaryIdToDomainName = void 0;
+exports.compareKeys = exports.isFileExisted = exports.hasChallengeNvidiaToken = exports.extractIntermediateCertificates = exports.extractCommonNameFromSubject = exports.splitCerts = exports.getPublicKeyFromCsr = exports.generateRsaKeyPair = exports.generateEcKeyPair = exports.getPublicKeyHash = exports.getPublicKeyPemHash = exports.getPublicKeyFromPrivate = exports.generateDomain = exports.binaryIdToDomainName = void 0;
 const types_1 = require("./types");
-const forge = __importStar(require("node-forge"));
 const crypto_1 = require("crypto");
 const base32 = __importStar(require("hi-base32"));
 const fs_1 = require("fs");
+const x509_1 = require("@peculiar/x509");
 const binaryIdToDomainName = (binaryId) => base32.encode(binaryId.subarray(0, 16)).replace(/=+$/, '').toLowerCase();
 exports.binaryIdToDomainName = binaryIdToDomainName;
 const generateDomain = (baseDomain, challengeType, binaryId) => `${(0, exports.binaryIdToDomainName)(binaryId)}.${challengeType}.${baseDomain}`;
 exports.generateDomain = generateDomain;
 const getPublicKeyFromPrivate = (privateKeyPem) => {
-    const privateKey = forge.pki.privateKeyFromPem(privateKeyPem);
-    const publicKey = forge.pki.rsa.setPublicKey(privateKey.n, privateKey.e);
-    return forge.pki.publicKeyToPem(publicKey);
+    return (0, crypto_1.createPublicKey)(privateKeyPem).export({
+        type: 'spki',
+        format: 'pem',
+    });
 };
 exports.getPublicKeyFromPrivate = getPublicKeyFromPrivate;
 const getPublicKeyPemHash = (publicKeyPem) => {
-    const publicKey = forge.pki.publicKeyFromPem(publicKeyPem);
+    const publicKey = (0, crypto_1.createPublicKey)(publicKeyPem);
     return (0, exports.getPublicKeyHash)(publicKey);
 };
 exports.getPublicKeyPemHash = getPublicKeyPemHash;
 const getPublicKeyHash = (publicKey) => {
-    const asn1 = forge.pki.publicKeyToAsn1(publicKey);
-    const der = forge.asn1.toDer(asn1).getBytes();
-    const keyBuffer = Buffer.from(der, 'binary');
+    const der = publicKey.export({
+        type: 'spki',
+        format: 'der',
+    });
     const hash = (0, crypto_1.createHash)('sha256');
-    hash.update(keyBuffer);
+    hash.update(der);
     return hash.digest();
 };
 exports.getPublicKeyHash = getPublicKeyHash;
-const getPublicKeyDigestRaw = (publicKeyPem) => {
-    const publicKey = forge.pki.publicKeyFromPem(publicKeyPem);
-    const asn1 = forge.pki.publicKeyToAsn1(publicKey);
-    const der = forge.asn1.toDer(asn1).getBytes();
-    const md = forge.md.sha256.create();
-    md.update(der, 'raw');
-    return md;
+const generateEcKeyPair = () => {
+    const keys = (0, crypto_1.generateKeyPairSync)('ec', {
+        namedCurve: 'secp256k1',
+        publicKeyEncoding: {
+            type: 'spki',
+            format: 'pem',
+        },
+        privateKeyEncoding: {
+            type: 'pkcs8',
+            format: 'pem',
+        },
+    });
+    return {
+        publicKeyPem: keys.publicKey,
+        privateKeyPem: keys.privateKey,
+    };
 };
-exports.getPublicKeyDigestRaw = getPublicKeyDigestRaw;
-const generateKeyPair = () => {
+exports.generateEcKeyPair = generateEcKeyPair;
+const generateRsaKeyPair = () => {
     const keys = (0, crypto_1.generateKeyPairSync)('rsa', {
         modulusLength: 2048,
         publicKeyEncoding: {
@@ -79,13 +90,17 @@ const generateKeyPair = () => {
         privateKeyPem: keys.privateKey,
     };
 };
-exports.generateKeyPair = generateKeyPair;
+exports.generateRsaKeyPair = generateRsaKeyPair;
 const getPublicKeyFromCsr = (csrPem) => {
-    const csr = forge.pki.certificationRequestFromPem(csrPem);
-    if (!csr.publicKey) {
-        throw new Error(`Missed publicKey in CSR`);
-    }
-    return forge.pki.publicKeyToPem(csr.publicKey);
+    const csr = new x509_1.Pkcs10CertificateRequest(csrPem);
+    return (0, crypto_1.createPublicKey)({
+        key: csr.publicKey.rawData,
+        format: 'der',
+        type: 'spki',
+    }).export({
+        format: 'pem',
+        type: 'spki',
+    });
 };
 exports.getPublicKeyFromCsr = getPublicKeyFromCsr;
 const splitCerts = (certsPem) => {
@@ -94,12 +109,10 @@ const splitCerts = (certsPem) => {
     return Array.from(matches || []);
 };
 exports.splitCerts = splitCerts;
-const extractCommonName = (certPem) => {
-    const cert = forge.pki.certificateFromPem(certPem);
-    const commonNameAttr = cert.subject.attributes.find((attr) => attr.name === 'commonName');
-    return commonNameAttr?.value;
+const extractCommonNameFromSubject = (subject) => {
+    return subject.match(/CN=([^,\n]+)/)?.[1]?.trim();
 };
-exports.extractCommonName = extractCommonName;
+exports.extractCommonNameFromSubject = extractCommonNameFromSubject;
 const extractIntermediateCertificates = (certificates) => {
     let restCerts;
     let certificate;
@@ -115,7 +128,7 @@ const extractIntermediateCertificates = (certificates) => {
     }
     const ca = restCerts.pop();
     return {
-        cert: certificate,
+        cert: certificate + '\n',
         intermediateCertificates: restCerts.join('\n') + '\n',
         ca: ca + '\n',
     };
@@ -135,4 +148,24 @@ const isFileExisted = (filePath) => fs_1.promises
     .then(() => true)
     .catch(() => false);
 exports.isFileExisted = isFileExisted;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbUNBT2lCO0FBQ2pCLGtEQUFvQztBQUNwQyxtQ0FBeUQ7QUFFekQsa0RBQW9DO0FBQ3BDLDJCQUF5QztBQUVsQyxNQUFNLG9CQUFvQixHQUFHLENBQUMsUUFBZ0IsRUFBRSxFQUFFLENBQ3JELE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO0FBRGhFLFFBQUEsb0JBQW9CLHdCQUM0QztBQUV0RSxNQUFNLGNBQWMsR0FBRyxDQUMxQixVQUFrQixFQUNsQixhQUE0QixFQUM1QixRQUFnQixFQUNsQixFQUFFLENBQUMsR0FBRyxJQUFBLDRCQUFvQixFQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWEsSUFBSSxVQUFVLEVBQUUsQ0FBQztBQUozRCxRQUFBLGNBQWMsa0JBSTZDO0FBRWpFLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxhQUFxQixFQUFFLEVBQUU7SUFDN0QsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM5RCxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekUsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUMvQyxDQUFDLENBQUM7QUFKVyxRQUFBLHVCQUF1QiwyQkFJbEM7QUFFSyxNQUFNLG1CQUFtQixHQUFHLENBQUMsWUFBb0IsRUFBRSxF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
+const compareKeys = (keyPemOne, keyPemTwo) => {
+    const privateJwk = (0, crypto_1.createPublicKey)(keyPemOne).export({ format: 'jwk' });
+    const publicJwk = (0, crypto_1.createPublicKey)(keyPemTwo).export({ format: 'jwk' });
+    if (publicJwk.kty !== privateJwk.kty) {
+        return false;
+    }
+    if (publicJwk.kty === 'RSA') {
+        return !!(publicJwk.n && privateJwk.n && publicJwk.n === privateJwk.n);
+    }
+    if (publicJwk.kty === 'EC') {
+        return !!(publicJwk.x &&
+            privateJwk.x &&
+            publicJwk.x === privateJwk.x &&
+            publicJwk.y &&
+            privateJwk.y &&
+            publicJwk.y === privateJwk.y);
+    }
+    return false;
+};
+exports.compareKeys = compareKeys;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbUNBT2lCO0FBQ2pCLG1DQUtnQjtBQUVoQixrREFBb0M7QUFDcEMsMkJBQXlDO0FBQ3pDLHlDQUEwRDtBQUVuRCxNQUFNLG9CQUFvQixHQUFHLENBQUMsUUFBZ0IsRUFBRSxFQUFFLENBQ3JELE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO0FBRGhFLFFBQUEsb0JBQW9CLHdCQUM0QztBQUV0RSxNQUFNLGNBQWMsR0FBRyxDQUMxQixVQUFrQixFQUNsQixhQUE0QixFQUM1QixRQUFnQixFQUNsQixFQUFFLENBQUMsR0FBRyxJQUFBLDRCQUFvQixFQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWEsSUFBSSxVQUFVLEVBQUUsQ0FBQztBQUozRCxRQUFBLGNBQWMsa0JBSTZDO0FBRWpFLE1BQU0sdUJBQXVCLEdBQUcsQ0FBQyxhQUFxQixFQUFVLEVBQUU7SUFDckUsT0FBTyxJQUFBLHdCQUFlLEVBQUMsYUFBYSxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ3pDLElBQUksRUFBRSxNQUFNO1FBQ1osTUFBTSxFQUFFLEtBQUs7S0FDaEIsQ0FBVyxDQUFDO0FBQ2pCLENBQUMsQ0FBQztBQUxXLFFBQUEsdUJBQXVCLDJCQUtsQztBQUVLLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxZQUFvQixFQUFFLEVBQUU7SUFDeEQsTUFBTSxTQUFTLEdBQUcsSUFBQSx3QkFBZSxFQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2hELE9BQU8sSUFBQSx3QkFBZ0IsRUFBQyxTQUFTLENBQUMsQ0FBQztBQUN2QyxDQUFDLENBQUM7QUFIVyxR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

package/dist/types.d.ts

@@ -39,8 +39,6 @@ export type Challenge = UntrustedChallenge | SGXDCAPChallenge | TDXChallenge | S
 export type ChallengeWithNvidiaToken = SNPChallenge | TDXChallenge;
 export interface PkiCertParams {
     alternativeDnsName?: string;
-    serialNumber: string;
-    notBefore: string;
     notAfter: string;
     commonName: string;
     countryName: string;
@@ -48,11 +46,12 @@ export interface PkiCertParams {
     localityName: string;
     organizationName: string;
     organizationUnitName: string;
+    ocspUrl?: string;
 }
 export interface PkiUntrustedStaticKeyStorage {
     type: 'untrusted-static';
-    publicKeyPem: string;
-    privateKeyPem: string;
+    basicPrivateKeyPem: string;
+    litePrivateKeyPem: string;
 }
 export interface PkiInMemoryKeyStorage {
     type: 'in-memory';
@@ -84,7 +83,9 @@ export interface AllowedSubRootChallenge {
     type: ChallengeType;
     idHex?: string;
     commonIdHex?: string;
+    solutionHashHex?: string;
 }
+export type AllowedOcspSignerChallenge = AllowedSubRootChallenge;
 export interface PKISslCertificate {
     certPem: string;
     rootCertsPem: string;

package/dist/types.js

@@ -20,4 +20,4 @@ var CertificateType;
     CertificateType["Basic"] = "basic";
     CertificateType["Lite"] = "lite";
 })(CertificateType || (exports.CertificateType = CertificateType = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxhQU9YO0FBUEQsV0FBWSxhQUFhO0lBQ3JCLHdDQUF1QixDQUFBO0lBQ3ZCLHFDQUFvQixDQUFBO0lBQ3BCLG1DQUFrQixDQUFBO0lBQ2xCLDRCQUFXLENBQUE7SUFDWCxtQ0FBa0IsQ0FBQTtJQUNsQiw0Q0FBMkIsQ0FBQTtBQUMvQixDQUFDLEVBUFcsYUFBYSw2QkFBYixhQUFhLFFBT3hCO0FBK0VELElBQVksT0FHWDtBQUhELFdBQVksT0FBTztJQUNmLHdCQUFhLENBQUE7SUFDYiw4QkFBbUIsQ0FBQTtBQUN2QixDQUFDLEVBSFcsT0FBTyx1QkFBUCxPQUFPLFFBR2xCO0FBZ0NELElBQVksZUFHWDtBQUhELFdBQVksZUFBZTtJQUN2QixrQ0FBZSxDQUFBO0lBQ2YsZ0NBQWEsQ0FBQTtBQUNqQixDQUFDLEVBSFcsZUFBZSwrQkFBZixlQUFlLFFBRzFCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxhQU9YO0FBUEQsV0FBWSxhQUFhO0lBQ3JCLHdDQUF1QixDQUFBO0lBQ3ZCLHFDQUFvQixDQUFBO0lBQ3BCLG1DQUFrQixDQUFBO0lBQ2xCLDRCQUFXLENBQUE7SUFDWCxtQ0FBa0IsQ0FBQTtJQUNsQiw0Q0FBMkIsQ0FBQTtBQUMvQixDQUFDLEVBUFcsYUFBYSw2QkFBYixhQUFhLFFBT3hCO0FBOEVELElBQVksT0FHWDtBQUhELFdBQVksT0FBTztJQUNmLHdCQUFhLENBQUE7SUFDYiw4QkFBbUIsQ0FBQTtBQUN2QixDQUFDLEVBSFcsT0FBTyx1QkFBUCxPQUFPLFFBR2xCO0FBbUNELElBQVksZUFHWDtBQUhELFdBQVksZUFBZTtJQUN2QixrQ0FBZSxDQUFBO0lBQ2YsZ0NBQWEsQ0FBQTtBQUNqQixDQUFDLEVBSFcsZUFBZSwrQkFBZixlQUFlLFFBRzFCIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/pki-common",
-  "version": "1.6.6",
+  "version": "1.7.2",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -19,8 +19,7 @@
   "author": "Super Protocol",
   "license": "ISC",
   "dependencies": {
-    "@types/node-forge": "^1.3.11",
-    "hi-base32": "^0.5.1",
-    "node-forge": "^1.3.1"
+    "@peculiar/x509": "^1.13.0",
+    "hi-base32": "^0.5.1"
   }
 }