@noz-ele/edgca 0.2.0 → 0.3.0

package/dist/bytes.d.ts

@@ -6,4 +6,5 @@ export declare function bytesToBinary(bytes: Uint8Array): string;
 export declare function binaryToBytes(binary: string): Uint8Array;
 export declare function cloneBytes(bytes: Uint8Array): Uint8Array;
 export declare function arrayBufferFromBytes(bytes: Uint8Array): ArrayBuffer;
+export declare function randomBytes(length: number): Uint8Array;
 //# sourceMappingURL=bytes.d.ts.map

package/dist/bytes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../src/bytes.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,UAAU,CAWpE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,OAAO,CAWhE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAYpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAUvD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAQxD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAExD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAInE"}
+{"version":3,"file":"bytes.d.ts","sourceRoot":"","sources":["../src/bytes.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,UAAU,CAWpE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,OAAO,CAWhE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAYpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAUvD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAQxD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAExD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAInE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAItD"}

package/dist/bytes.js

@@ -56,3 +56,8 @@ export function arrayBufferFromBytes(bytes) {
     copy.set(bytes);
     return copy.buffer;
 }
+export function randomBytes(length) {
+    const bytes = new Uint8Array(length);
+    crypto.getRandomValues(bytes);
+    return bytes;
+}

package/dist/der.d.ts

@@ -31,6 +31,7 @@ export declare function boolean(value: boolean): Uint8Array;
 export declare function integer(value: bigint | number | Uint8Array): Uint8Array;
 export declare function bitString(bytes: Uint8Array, unusedBits?: number): Uint8Array;
 export declare function octetString(bytes: Uint8Array): Uint8Array;
+export declare function nullValue(): Uint8Array;
 export declare function utf8String(value: string): Uint8Array;
 export declare function printableString(value: string): Uint8Array;
 export declare function ia5String(value: string): Uint8Array;

package/dist/der.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"der.d.ts","sourceRoot":"","sources":["../src/der.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG;;;;;;;;;;;;;;CAcN,CAAC;AAEX,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,wBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAE9D;AAED,wBAAgB,QAAQ,CAAC,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAE9D;AAED,wBAAgB,GAAG,CAAC,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAEzD;AAED,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAEzE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAmB7C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAElD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CA4BvE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,SAAI,GAAG,UAAU,CAMvE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEzD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAMzD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAEjF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAO9C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAMtD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,SAAI,GAAG,UAAU,CAuBrE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,EAAE,CAMtE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,EAAE,CAW5D;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CA4CnD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAevD"}
+{"version":3,"file":"der.d.ts","sourceRoot":"","sources":["../src/der.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG;;;;;;;;;;;;;;CAcN,CAAC;AAEX,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,wBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAE9D;AAED,wBAAgB,QAAQ,CAAC,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAE9D;AAED,wBAAgB,GAAG,CAAC,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,CAEzD;AAED,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAEzE;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAmB7C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAElD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CA4BvE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,SAAI,GAAG,UAAU,CAMvE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEzD;AAED,wBAAgB,SAAS,IAAI,UAAU,CAEtC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEpD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAMzD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,CAEjF;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAO9C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,CAMtD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,SAAI,GAAG,UAAU,CAuBrE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU,EAAE,CAMtE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,EAAE,CAW5D;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CA4CnD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAevD"}

package/dist/der.js

@@ -79,6 +79,9 @@ export function bitString(bytes, unusedBits = 0) {
 export function octetString(bytes) {
     return der(TAG.OCTET_STRING, bytes);
 }
+export function nullValue() {
+    return new Uint8Array([TAG.NULL, 0x00]);
+}
 export function utf8String(value) {
     return der(TAG.UTF8_STRING, utf8Bytes(value));
 }

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { createRootCA, importCertificateAuthority, issueClientCert, issueClientCertForPublicKey, issueIntermediateCA } from "./ca.js";
 export { parseCertificateSigningRequest, verifyCertificateSigningRequestSignature, type ParsedCertificateSigningRequest, type CertificateSigningRequestExtension, type CertificateSigningRequestAttribute } from "./csr.js";
 export { pemToDer, certificateToPem } from "./pem.js";
+export { exportPkcs12, type ExportPkcs12Input } from "./pkcs12.js";
 export { verifyClientCertificateIssuedBy, type VerifyClientCertificateIssuedByOptions, type VerifyClientCertificateValidity } from "./verify.js";
 export type { CertificateAuthority, CreateRootCAOptions, ImportCertificateAuthorityOptions, IssueClientCertForPublicKeyOptions, IssueClientCertOptions, IssueIntermediateCAOptions, IssuedClientCertificate, IssuedClientCertificateForPublicKey, SerialNumber, ShortSubjectAttributeType, Subject, SubjectAttribute, SubjectAttributeType } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,eAAe,EACf,2BAA2B,EAC3B,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,wCAAwC,EACxC,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,kCAAkC,EACxC,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EACL,+BAA+B,EAC/B,KAAK,sCAAsC,EAC3C,KAAK,+BAA+B,EACrC,MAAM,aAAa,CAAC;AACrB,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,iCAAiC,EACjC,kCAAkC,EAClC,sBAAsB,EACtB,0BAA0B,EAC1B,uBAAuB,EACvB,mCAAmC,EACnC,YAAY,EACZ,yBAAyB,EACzB,OAAO,EACP,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,eAAe,EACf,2BAA2B,EAC3B,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,wCAAwC,EACxC,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,kCAAkC,EACxC,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EACL,+BAA+B,EAC/B,KAAK,sCAAsC,EAC3C,KAAK,+BAA+B,EACrC,MAAM,aAAa,CAAC;AACrB,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,iCAAiC,EACjC,kCAAkC,EAClC,sBAAsB,EACtB,0BAA0B,EAC1B,uBAAuB,EACvB,mCAAmC,EACnC,YAAY,EACZ,yBAAyB,EACzB,OAAO,EACP,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
 export { createRootCA, importCertificateAuthority, issueClientCert, issueClientCertForPublicKey, issueIntermediateCA } from "./ca.js";
 export { parseCertificateSigningRequest, verifyCertificateSigningRequestSignature } from "./csr.js";
 export { pemToDer, certificateToPem } from "./pem.js";
+export { exportPkcs12 } from "./pkcs12.js";
 export { verifyClientCertificateIssuedBy } from "./verify.js";

package/dist/oids.d.ts

@@ -15,6 +15,18 @@ export declare const OID: {
     readonly authorityKeyIdentifier: "2.5.29.35";
     readonly clientAuth: "1.3.6.1.5.5.7.3.2";
     readonly extensionRequest: "1.2.840.113549.1.9.14";
+    readonly data: "1.2.840.113549.1.7.1";
+    readonly encryptedData: "1.2.840.113549.1.7.6";
+    readonly friendlyName: "1.2.840.113549.1.9.20";
+    readonly localKeyId: "1.2.840.113549.1.9.21";
+    readonly x509Certificate: "1.2.840.113549.1.9.22.1";
+    readonly certBag: "1.2.840.113549.1.12.10.1.3";
+    readonly pkcs8ShroudedKeyBag: "1.2.840.113549.1.12.10.1.2";
+    readonly pbes2: "1.2.840.113549.1.5.13";
+    readonly pbkdf2: "1.2.840.113549.1.5.12";
+    readonly hmacWithSha256: "1.2.840.113549.2.9";
+    readonly aes256Cbc: "2.16.840.1.101.3.4.1.42";
+    readonly sha256: "2.16.840.1.101.3.4.2.1";
 };
 export declare const SUBJECT_ATTRIBUTE_OIDS: Record<ShortSubjectAttributeType, string>;
 export declare const SUBJECT_VALUE_LENGTH_LIMITS: Record<ShortSubjectAttributeType, number>;

package/dist/oids.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oids.d.ts","sourceRoot":"","sources":["../src/oids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;CAgBN,CAAC;AAEX,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAgB5E,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAgBjF,CAAC;AAIF,eAAO,MAAM,wBAAwB,MAAM,CAAC"}
+{"version":3,"file":"oids.d.ts","sourceRoot":"","sources":["../src/oids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BN,CAAC;AAEX,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAgB5E,CAAC;AAGF,eAAO,MAAM,2BAA2B,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAgBjF,CAAC;AAIF,eAAO,MAAM,wBAAwB,MAAM,CAAC"}

package/dist/oids.js

@@ -13,7 +13,19 @@ export const OID = {
     subjectKeyIdentifier: "2.5.29.14",
     authorityKeyIdentifier: "2.5.29.35",
     clientAuth: "1.3.6.1.5.5.7.3.2",
-    extensionRequest: "1.2.840.113549.1.9.14"
+    extensionRequest: "1.2.840.113549.1.9.14",
+    data: "1.2.840.113549.1.7.1",
+    encryptedData: "1.2.840.113549.1.7.6",
+    friendlyName: "1.2.840.113549.1.9.20",
+    localKeyId: "1.2.840.113549.1.9.21",
+    x509Certificate: "1.2.840.113549.1.9.22.1",
+    certBag: "1.2.840.113549.1.12.10.1.3",
+    pkcs8ShroudedKeyBag: "1.2.840.113549.1.12.10.1.2",
+    pbes2: "1.2.840.113549.1.5.13",
+    pbkdf2: "1.2.840.113549.1.5.12",
+    hmacWithSha256: "1.2.840.113549.2.9",
+    aes256Cbc: "2.16.840.1.101.3.4.1.42",
+    sha256: "2.16.840.1.101.3.4.2.1"
 };
 export const SUBJECT_ATTRIBUTE_OIDS = {
     CN: "2.5.4.3",

package/dist/pkcs12.d.ts

@@ -0,0 +1,11 @@
+export interface ExportPkcs12Input {
+    certDer: Uint8Array;
+    chainDer?: Uint8Array[];
+    privateKey: CryptoKey;
+    password: Uint8Array;
+    friendlyName?: Uint8Array;
+    iterations?: number;
+    macIterations?: number;
+}
+export declare function exportPkcs12(input: ExportPkcs12Input): Promise<Uint8Array>;
+//# sourceMappingURL=pkcs12.d.ts.map

package/dist/pkcs12.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pkcs12.d.ts","sourceRoot":"","sources":["../src/pkcs12.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IACxB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;IACrB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAUD,wBAAsB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CA8FhF"}

package/dist/pkcs12.js

@@ -0,0 +1,248 @@
+import { arrayBufferFromBytes, concatBytes, randomBytes } from "./bytes.js";
+import { digestSha256, keyIdentifierFromSpki } from "./crypto.js";
+import { contextPrimitive, der, explicit, integer, nullValue, octetString, oid, sequence, set } from "./der.js";
+import { OID } from "./oids.js";
+import { parseCertificateDer } from "./parser.js";
+const DEFAULT_PBKDF2_ITERATIONS = 600_000;
+const DEFAULT_MAC_ITERATIONS = 100_000;
+const SALT_LENGTH = 16;
+const IV_LENGTH = 16;
+const MAC_KEY_LENGTH = 32;
+const SHA256_BLOCK_SIZE = 64;
+const PKCS12_KDF_ID_MAC = 3;
+export async function exportPkcs12(input) {
+    const iterations = input.iterations ?? DEFAULT_PBKDF2_ITERATIONS;
+    const macIterations = input.macIterations ?? DEFAULT_MAC_ITERATIONS;
+    validateInput(input, iterations, macIterations);
+    const parsedLeaf = await parseCertificateDer(input.certDer);
+    const localKeyId = await keyIdentifierFromSpki(parsedLeaf.subjectPublicKeyInfoDer);
+    const friendlyNameAttr = input.friendlyName !== undefined && input.friendlyName.length > 0
+        ? buildFriendlyNameAttr(input.friendlyName)
+        : undefined;
+    const localKeyIdAttr = buildLocalKeyIdAttr(localKeyId);
+    const leafAttrs = friendlyNameAttr ? [localKeyIdAttr, friendlyNameAttr] : [localKeyIdAttr];
+    const certBags = [buildCertSafeBag(input.certDer, leafAttrs)];
+    if (input.chainDer) {
+        for (const c of input.chainDer) {
+            certBags.push(buildCertSafeBag(c, []));
+        }
+    }
+    const certSafeContents = sequence(...certBags);
+    // Import the password into a non-extractable PBKDF2 baseKey once and reuse
+    // it across both cert-bag and key-bag encryption. This halves the number of
+    // password-byte ArrayBuffer copies handed to WebCrypto (which we cannot
+    // wipe) from two to one.
+    const pbkdf2BaseKey = await crypto.subtle.importKey("raw", arrayBufferFromBytes(input.password), "PBKDF2", false, ["deriveKey"]);
+    const certEncrypted = await pbes2EncryptAesCbc(certSafeContents, pbkdf2BaseKey, iterations);
+    const certContentInfo = sequence(oid(OID.encryptedData), explicit(0, sequence(integer(0n), sequence(oid(OID.data), certEncrypted.algorithm, contextPrimitive(0, certEncrypted.ciphertext)))));
+    const pkcs8 = new Uint8Array(await crypto.subtle.exportKey("pkcs8", input.privateKey));
+    const keyEncrypted = await pbes2EncryptAesCbc(pkcs8, pbkdf2BaseKey, iterations);
+    wipe(pkcs8);
+    const epki = sequence(keyEncrypted.algorithm, octetString(keyEncrypted.ciphertext));
+    const keyBag = buildKeySafeBag(epki, leafAttrs);
+    const keySafeContents = sequence(keyBag);
+    const keyContentInfo = sequence(oid(OID.data), explicit(0, octetString(keySafeContents)));
+    const authenticatedSafe = sequence(certContentInfo, keyContentInfo);
+    const macSalt = randomBytes(SALT_LENGTH);
+    const passwordUtf16 = utf8ToUtf16BeWithTerminator(input.password);
+    const macKey = await pkcs12V1KdfMacKey(passwordUtf16, macSalt, macIterations);
+    wipe(passwordUtf16);
+    const macKeyHandle = await crypto.subtle.importKey("raw", arrayBufferFromBytes(macKey), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+    wipe(macKey);
+    const mac = new Uint8Array(await crypto.subtle.sign("HMAC", macKeyHandle, arrayBufferFromBytes(authenticatedSafe)));
+    const macData = sequence(sequence(sequence(oid(OID.sha256), nullValue()), octetString(mac)), octetString(macSalt), integer(BigInt(macIterations)));
+    const pfxAuthSafeContentInfo = sequence(oid(OID.data), explicit(0, octetString(authenticatedSafe)));
+    return sequence(integer(3n), pfxAuthSafeContentInfo, macData);
+}
+function validateInput(input, iterations, macIterations) {
+    if (!(input.password instanceof Uint8Array) || input.password.length === 0) {
+        throw new Error("password must be a non-empty Uint8Array of UTF-8 bytes");
+    }
+    if (!input.privateKey.extractable) {
+        throw new Error("privateKey must be extractable");
+    }
+    if (input.privateKey.algorithm.name !== "ECDSA") {
+        throw new Error("privateKey must be an ECDSA key");
+    }
+    if (!Number.isInteger(iterations) || iterations < 1) {
+        throw new Error("iterations must be a positive integer");
+    }
+    if (!Number.isInteger(macIterations) || macIterations < 1) {
+        throw new Error("macIterations must be a positive integer");
+    }
+    if (input.friendlyName !== undefined && !(input.friendlyName instanceof Uint8Array)) {
+        throw new Error("friendlyName must be a Uint8Array of UTF-8 bytes");
+    }
+}
+function buildCertSafeBag(certDer, attrs) {
+    const certBagInner = sequence(oid(OID.x509Certificate), explicit(0, octetString(certDer)));
+    return safeBag(OID.certBag, certBagInner, attrs);
+}
+function buildKeySafeBag(encryptedPrivateKeyInfo, attrs) {
+    return safeBag(OID.pkcs8ShroudedKeyBag, encryptedPrivateKeyInfo, attrs);
+}
+function safeBag(bagOid, bagValue, attrs) {
+    const parts = [oid(bagOid), explicit(0, bagValue)];
+    if (attrs.length > 0) {
+        parts.push(canonicalSetOf(attrs));
+    }
+    return sequence(...parts);
+}
+// X.690 §11.6: SET OF components are encoded in ascending order of their
+// encoded octet strings, with the shorter component padded with trailing
+// 0-octets for the comparison. Used for bagAttributes.
+function canonicalSetOf(children) {
+    const sorted = [...children].sort(derSetCompare);
+    return set(...sorted);
+}
+function derSetCompare(a, b) {
+    const len = Math.max(a.length, b.length);
+    for (let i = 0; i < len; i += 1) {
+        const av = i < a.length ? a[i] : 0;
+        const bv = i < b.length ? b[i] : 0;
+        if (av !== bv)
+            return av - bv;
+    }
+    return 0;
+}
+function buildLocalKeyIdAttr(localKeyId) {
+    return sequence(oid(OID.localKeyId), set(octetString(localKeyId)));
+}
+function buildFriendlyNameAttr(friendlyNameUtf8) {
+    return sequence(oid(OID.friendlyName), set(bmpString(friendlyNameUtf8)));
+}
+function bmpString(utf8) {
+    const utf16 = utf8ToUtf16Be(utf8);
+    return der(0x1e, utf16);
+}
+async function pbes2EncryptAesCbc(plaintext, pbkdf2BaseKey, iterations) {
+    const salt = randomBytes(SALT_LENGTH);
+    const iv = randomBytes(IV_LENGTH);
+    const aesKey = await crypto.subtle.deriveKey({ name: "PBKDF2", salt: arrayBufferFromBytes(salt), iterations, hash: "SHA-256" }, pbkdf2BaseKey, { name: "AES-CBC", length: 256 }, false, ["encrypt"]);
+    const ciphertext = new Uint8Array(await crypto.subtle.encrypt({ name: "AES-CBC", iv: arrayBufferFromBytes(iv) }, aesKey, arrayBufferFromBytes(plaintext)));
+    return {
+        algorithm: algorithmIdentifierPbes2(salt, iterations, iv),
+        ciphertext
+    };
+}
+function algorithmIdentifierPbes2(salt, iterations, iv) {
+    const pbkdf2Params = sequence(octetString(salt), integer(BigInt(iterations)), sequence(oid(OID.hmacWithSha256), nullValue()));
+    const keyDerivationFunc = sequence(oid(OID.pbkdf2), pbkdf2Params);
+    const encryptionScheme = sequence(oid(OID.aes256Cbc), octetString(iv));
+    return sequence(oid(OID.pbes2), sequence(keyDerivationFunc, encryptionScheme));
+}
+// PKCS#12 v1 KDF (RFC 7292 App.B) producing an HMAC-SHA-256 key (32 bytes).
+// Specialized for ID=3, n=u=32, v=64. Single-block output: no I update needed.
+async function pkcs12V1KdfMacKey(passwordUtf16, salt, iterations) {
+    const v = SHA256_BLOCK_SIZE;
+    const D = new Uint8Array(v).fill(PKCS12_KDF_ID_MAC);
+    const sLen = Math.ceil(salt.length / v) * v;
+    const S2 = new Uint8Array(sLen);
+    for (let i = 0; i < sLen; i += 1) {
+        S2[i] = salt[i % salt.length];
+    }
+    const pLen = Math.ceil(passwordUtf16.length / v) * v;
+    const P2 = new Uint8Array(pLen);
+    for (let i = 0; i < pLen; i += 1) {
+        P2[i] = passwordUtf16[i % passwordUtf16.length];
+    }
+    const I = concatBytes([S2, P2]);
+    // T_0 holds D || S2 || P2 (raw password bytes embedded in P2).
+    // Each digestSha256 returns a fresh 32-byte buffer; the previous T's buffer
+    // becomes unreachable but, without an explicit wipe, would sit on the JS
+    // heap until GC. Zero it before reassigning. Successive Ts are H^j(D||I)
+    // values, which let an attacker reach H^c(D||I) = MAC key by continuing the
+    // chain — they're as sensitive as the MAC key itself.
+    let T = concatBytes([D, I]);
+    for (let j = 0; j < iterations; j += 1) {
+        const next = await digestSha256(T);
+        T.fill(0);
+        T = next;
+    }
+    wipe(D, S2, P2, I);
+    return T.subarray(0, MAC_KEY_LENGTH);
+}
+// Convert UTF-8 bytes to UTF-16BE bytes plus a 0x00 0x00 terminator,
+// without going through any JavaScript string. Walks code points by hand.
+function utf8ToUtf16BeWithTerminator(utf8) {
+    const utf16 = utf8ToUtf16Be(utf8);
+    const out = new Uint8Array(utf16.length + 2);
+    out.set(utf16, 0);
+    wipe(utf16);
+    return out;
+}
+// Two-pass to avoid an intermediate `number[]` that would retain
+// password-derived bytes on the JS heap until GC. Pass 1 sizes the output;
+// pass 2 writes directly into a tight Uint8Array. Both passes share the same
+// boundary checks so an invalid leader byte fails fast in pass 1.
+function utf8ToUtf16Be(utf8) {
+    let outLen = 0;
+    let i = 0;
+    while (i < utf8.length) {
+        const b1 = utf8[i];
+        if (b1 < 0x80) {
+            outLen += 2;
+            i += 1;
+        }
+        else if ((b1 & 0xe0) === 0xc0 && i + 1 < utf8.length) {
+            outLen += 2;
+            i += 2;
+        }
+        else if ((b1 & 0xf0) === 0xe0 && i + 2 < utf8.length) {
+            outLen += 2;
+            i += 3;
+        }
+        else if ((b1 & 0xf8) === 0xf0 && i + 3 < utf8.length) {
+            outLen += 4;
+            i += 4;
+        }
+        else {
+            throw new Error("Invalid UTF-8 sequence");
+        }
+    }
+    const out = new Uint8Array(outLen);
+    let oi = 0;
+    i = 0;
+    while (i < utf8.length) {
+        const b1 = utf8[i];
+        let cp;
+        if (b1 < 0x80) {
+            cp = b1;
+            i += 1;
+        }
+        else if ((b1 & 0xe0) === 0xc0) {
+            cp = ((b1 & 0x1f) << 6) | (utf8[i + 1] & 0x3f);
+            i += 2;
+        }
+        else if ((b1 & 0xf0) === 0xe0) {
+            cp = ((b1 & 0x0f) << 12) | ((utf8[i + 1] & 0x3f) << 6) | (utf8[i + 2] & 0x3f);
+            i += 3;
+        }
+        else {
+            cp = ((b1 & 0x07) << 18)
+                | ((utf8[i + 1] & 0x3f) << 12)
+                | ((utf8[i + 2] & 0x3f) << 6)
+                | (utf8[i + 3] & 0x3f);
+            i += 4;
+        }
+        if (cp < 0x10000) {
+            out[oi++] = (cp >> 8) & 0xff;
+            out[oi++] = cp & 0xff;
+        }
+        else {
+            const adj = cp - 0x10000;
+            const high = 0xd800 + ((adj >> 10) & 0x3ff);
+            const low = 0xdc00 + (adj & 0x3ff);
+            out[oi++] = (high >> 8) & 0xff;
+            out[oi++] = high & 0xff;
+            out[oi++] = (low >> 8) & 0xff;
+            out[oi++] = low & 0xff;
+        }
+    }
+    return out;
+}
+function wipe(...bufs) {
+    for (const b of bufs) {
+        b.fill(0);
+    }
+}

package/dist/x509.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"x509.d.ts","sourceRoot":"","sources":["../src/x509.ts"],"names":[],"mappings":"AACA,OAAO,EAAiC,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAkBjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,UAAU,CAAC;IAC1B,cAAc,EAAE,UAAU,CAAC;IAC3B,uBAAuB,EAAE,UAAU,CAAC;IACpC,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,UAAU,CAAC;IAC9B,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,IAAI,CAAC;CAChB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,qBAAqB,GAAG,oBAAoB,CAoBtF;AAED,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,UAAU,EAC7B,YAAY,EAAE,UAAU,EACxB,WAAW,EAAE,cAAc,GAC1B,UAAU,CAEZ;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,cAAc,GAAG,UAAU,CAEnF;AAED,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,MAAM,GAAG,UAAU,CAMjF;AAED,wBAAgB,6BAA6B,IAAI,UAAU,CAE1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,GAAG,UAAU,CAgB5E;AAED,wBAAgB,mCAAmC,IAAI,UAAU,CAEhE;AAED,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,UAAU,GAAG,UAAU,CAEnF;AAED,wBAAgB,+BAA+B,CAAC,aAAa,EAAE,UAAU,GAAG,UAAU,CAErF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,GAAG,SAAS,CAmC7H;AAwID,QAAA,MAAM,cAAc;;;;CAIV,CAAC;AAEX,KAAK,WAAW,GAAG,MAAM,OAAO,cAAc,CAAC"}
+{"version":3,"file":"x509.d.ts","sourceRoot":"","sources":["../src/x509.ts"],"names":[],"mappings":"AACA,OAAO,EAAiC,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAkBjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,UAAU,CAAC;IAC1B,cAAc,EAAE,UAAU,CAAC;IAC3B,uBAAuB,EAAE,UAAU,CAAC;IACpC,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,UAAU,CAAC;IAC9B,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,IAAI,CAAC;CAChB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,qBAAqB,GAAG,oBAAoB,CAoBtF;AAED,wBAAgB,gBAAgB,CAC9B,iBAAiB,EAAE,UAAU,EAC7B,YAAY,EAAE,UAAU,EACxB,WAAW,EAAE,cAAc,GAC1B,UAAU,CAEZ;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,cAAc,GAAG,UAAU,CAEnF;AAED,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,MAAM,GAAG,UAAU,CAMjF;AAED,wBAAgB,6BAA6B,IAAI,UAAU,CAE1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,GAAG,UAAU,CAgB5E;AAED,wBAAgB,mCAAmC,IAAI,UAAU,CAEhE;AAED,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,UAAU,GAAG,UAAU,CAEnF;AAED,wBAAgB,+BAA+B,CAAC,aAAa,EAAE,UAAU,GAAG,UAAU,CAErF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,GAAG,SAAS,CAmC7H;AAuID,QAAA,MAAM,cAAc;;;;CAIV,CAAC;AAEX,KAAK,WAAW,GAAG,MAAM,OAAO,cAAc,CAAC"}

package/dist/x509.js

@@ -1,4 +1,4 @@
-import { asciiBytes, concatBytes } from "./bytes.js";
+import { asciiBytes, concatBytes, randomBytes } from "./bytes.js";
 import { signatureAlgorithmOidForCurve } from "./crypto.js";
 import { bitString, boolean, contextPrimitive, der, explicit, generalizedTime, integer, octetString, oid, readElement, sequence, TAG, utcTime } from "./der.js";
 import { encodeIpAddress } from "./ip.js";
@@ -106,8 +106,7 @@ function encodeSerialNumber(serialNumber) {
 }
 function encodeSerialNumberDer(serialNumber) {
     if (serialNumber === undefined) {
-        const bytes = new Uint8Array(16);
-        crypto.getRandomValues(bytes);
+        const bytes = randomBytes(16);
         bytes[0] = bytes[0] & 0x7f;
         if (bytes.every((byte) => byte === 0)) {
             bytes[15] = 1;

package/package.json

@@ -1,66 +1,70 @@
-{
-  "name": "@noz-ele/edgca",
-  "version": "0.2.0",
-  "description": "A small Cloudflare Workers-friendly toolkit for issuing self-managed CA and mTLS client certificates.",
-  "type": "module",
-  "license": "MIT",
-  "author": "NOZ-ELE",
-  "homepage": "https://github.com/noz-ele/EdgCA#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/noz-ele/EdgCA.git"
-  },
-  "bugs": {
-    "url": "https://github.com/noz-ele/EdgCA/issues"
-  },
-  "keywords": [
-    "ca",
-    "x509",
-    "mtls",
-    "client-certificate",
-    "pki",
-    "ecdsa",
-    "p-256",
-    "webcrypto",
-    "cloudflare-workers",
-    "edge"
-  ],
-  "engines": {
-    "node": ">=20"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "sideEffects": false,
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md",
-    "SECURITY.md"
-  ],
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    }
-  },
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "pretest": "npm run build",
-    "test": "vitest run",
-    "pretest:workers": "npm run build",
-    "prepack": "npm run build",
-    "prepublishOnly": "npm run typecheck && npm test",
-    "test:workers": "vitest run --config vitest.config.ts"
-  },
-  "devDependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.15.2",
-    "@vitest/coverage-istanbul": "^4.1.5",
-    "fast-check": "^4.7.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.5",
-    "wrangler": "^4.45.0"
-  }
-}
+{
+  "name": "@noz-ele/edgca",
+  "version": "0.3.0",
+  "description": "A small Cloudflare Workers-friendly toolkit for issuing self-managed CA and mTLS client certificates.",
+  "type": "module",
+  "license": "MIT",
+  "author": "NOZ-ELE",
+  "homepage": "https://github.com/noz-ele/EdgCA#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/noz-ele/EdgCA.git"
+  },
+  "bugs": {
+    "url": "https://github.com/noz-ele/EdgCA/issues"
+  },
+  "keywords": [
+    "ca",
+    "x509",
+    "mtls",
+    "client-certificate",
+    "pki",
+    "ecdsa",
+    "p-256",
+    "webcrypto",
+    "cloudflare-workers",
+    "edge"
+  ],
+  "engines": {
+    "node": ">=20"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md",
+    "SECURITY.md"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./pkcs12": {
+      "types": "./dist/pkcs12.d.ts",
+      "import": "./dist/pkcs12.js"
+    }
+  },
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "pretest": "npm run build",
+    "test": "vitest run && vitest run --config vitest.node.config.ts",
+    "pretest:workers": "npm run build",
+    "prepack": "npm run build",
+    "prepublishOnly": "npm run typecheck && npm test",
+    "test:workers": "vitest run --config vitest.config.ts"
+  },
+  "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.15.2",
+    "@vitest/coverage-istanbul": "^4.1.5",
+    "fast-check": "^4.7.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.5",
+    "wrangler": "^4.45.0"
+  }
+}