react-native-quick-crypto 1.0.17 → 1.0.18

package/lib/typescript/ed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ed.d.ts","sourceRoot":"","sources":["../../src/ed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,EACL,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,GAAG,EACH,gBAAgB,EAChB,QAAQ,EACR,eAAe,EAChB,MAAM,SAAS,CAAC;AAWjB,qBAAa,EAAE;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,SAAS,CAAC;gBAEN,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB;IAO3D;;;;;;;;;;OAUG;IACH,aAAa,CACX,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,MAAM,GAAG,IAAI;IAyBV,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,mBAAmB,IAAI,IAAI;IAW3B,YAAY,IAAI,WAAW;IAI3B,aAAa,IAAI,WAAW;IAI5B;;;;;;;;;OASG;IACH,eAAe,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,WAAW;IAIvD,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAMvE,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,WAAW;IAMtD,MAAM,CACV,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,OAAO,CAAC,OAAO,CAAC;IAMnB,UAAU,CACR,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,OAAO;CAKX;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,MAAM,GAAG,IAAI,CAaf;AAGD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,uBAAuB,GAAG,SAAS,GAC5C,qBAAqB,GAAG,IAAI,CAgE9B;AAmGD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,SAAS,GAAG,OAAO,EACzB,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,aAAa,CAAC,CAsDxB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,QAAQ,GAAG,MAAM,EACvB,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,aAAa,CAAC,CAsDxB;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,WAAW,CAmCb"}
+{"version":3,"file":"ed.d.ts","sourceRoot":"","sources":["../../src/ed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,EACL,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,GAAG,EACH,gBAAgB,EAChB,QAAQ,EACR,eAAe,EAChB,MAAM,SAAS,CAAC;AAWjB,qBAAa,EAAE;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,SAAS,CAAC;gBAEN,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB;IAO3D;;;;;;;;;;OAUG;IACH,aAAa,CACX,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,MAAM,GAAG,IAAI;IA2BV,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,mBAAmB,IAAI,IAAI;IAW3B,YAAY,IAAI,WAAW;IAI3B,aAAa,IAAI,WAAW;IAI5B;;;;;;;;;OASG;IACH,eAAe,CAAC,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,WAAW;IAIvD,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAMvE,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,WAAW;IAMtD,MAAM,CACV,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,OAAO,CAAC,OAAO,CAAC;IAMnB,UAAU,CACR,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,OAAO;CAKX;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,MAAM,GAAG,IAAI,CAaf;AAuED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,uBAAuB,GAAG,SAAS,GAC5C,qBAAqB,GAAG,IAAI,CAyC9B;AAmGD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,SAAS,GAAG,OAAO,EACzB,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,aAAa,CAAC,CAuCxB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,QAAQ,GAAG,MAAM,EACvB,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,QAAQ,EAAE,GACpB,OAAO,CAAC,aAAa,CAAC,CAuCxB;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,WAAW,CAmCb"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-quick-crypto",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "A fast implementation of Node's `crypto` module written in C/C++ JSI",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/ed.ts

@@ -58,9 +58,11 @@ export class Ed {
     options: DiffieHellmanOptions,
     callback?: DiffieHellmanCallback,
   ): Buffer | void {
-    // extract the private and public keys as ArrayBuffers
-    const privateKey = toAB(options.privateKey);
-    const publicKey = toAB(options.publicKey);
+    // extract raw key bytes from KeyObject instances
+    const privKeyObj = options.privateKey as AsymmetricKeyObject;
+    const pubKeyObj = options.publicKey as AsymmetricKeyObject;
+    const privateKey = privKeyObj.handle.exportKey();
+    const publicKey = pubKeyObj.handle.exportKey();
 
     try {
       const ret = this.native.diffieHellman(privateKey, publicKey);
@@ -178,51 +180,97 @@ export function diffieHellman(
   return ed.diffieHellman(options, callback);
 }
 
+function ed_createKeyObjects(ed: Ed): {
+  pub: PublicKeyObject;
+  priv: PrivateKeyObjectClass;
+} {
+  const publicKeyData = ed.getPublicKey();
+  const privateKeyData = ed.getPrivateKey();
+  const pub = KeyObject.createKeyObject(
+    'public',
+    publicKeyData,
+    KFormatType.DER,
+    KeyEncoding.SPKI,
+  ) as PublicKeyObject;
+  const priv = KeyObject.createKeyObject(
+    'private',
+    privateKeyData,
+    KFormatType.DER,
+    KeyEncoding.PKCS8,
+  ) as PrivateKeyObjectClass;
+  return { pub, priv };
+}
+
 // Node API
+function ed_formatKeyPairOutput(
+  ed: Ed,
+  encoding: KeyPairGenConfig,
+): {
+  publicKey: PublicKeyObject | string | ArrayBuffer;
+  privateKey: PrivateKeyObjectClass | string | ArrayBuffer;
+} {
+  const { publicFormat, privateFormat, cipher, passphrase } = encoding;
+  const { pub, priv } = ed_createKeyObjects(ed);
+
+  let publicKey: PublicKeyObject | string | ArrayBuffer;
+  let privateKey: PrivateKeyObjectClass | string | ArrayBuffer;
+
+  if (publicFormat == null || publicFormat === -1) {
+    publicKey = pub;
+  } else {
+    const format =
+      publicFormat === KFormatType.PEM ? KFormatType.PEM : KFormatType.DER;
+    const exported = pub.handle.exportKey(format, KeyEncoding.SPKI);
+    if (format === KFormatType.PEM) {
+      publicKey = Buffer.from(new Uint8Array(exported)).toString('utf-8');
+    } else {
+      publicKey = exported;
+    }
+  }
+
+  if (privateFormat == null || privateFormat === -1) {
+    privateKey = priv;
+  } else {
+    const format =
+      privateFormat === KFormatType.PEM ? KFormatType.PEM : KFormatType.DER;
+    const exported = priv.handle.exportKey(
+      format,
+      KeyEncoding.PKCS8,
+      cipher,
+      passphrase,
+    );
+    if (format === KFormatType.PEM) {
+      privateKey = Buffer.from(new Uint8Array(exported)).toString('utf-8');
+    } else {
+      privateKey = exported;
+    }
+  }
+
+  return { publicKey, privateKey };
+}
+
 export function ed_generateKeyPair(
   isAsync: boolean,
   type: CFRGKeyPairType,
   encoding: KeyPairGenConfig,
   callback: GenerateKeyPairCallback | undefined,
 ): GenerateKeyPairReturn | void {
-  const ed = new Ed(type, encoding);
-
-  // Helper to convert keys to proper output format
-  const formatKeys = (): {
-    publicKey: string | ArrayBuffer;
-    privateKey: string | ArrayBuffer;
-  } => {
-    const publicKeyRaw = ed.getPublicKey();
-    const privateKeyRaw = ed.getPrivateKey();
-
-    // Check if PEM format was requested (KFormatType.PEM = 1)
-    const isPemPublic = encoding.publicFormat === KFormatType.PEM;
-    const isPemPrivate = encoding.privateFormat === KFormatType.PEM;
-
-    // Convert ArrayBuffer to string for PEM format
-    const arrayBufferToString = (ab: ArrayBuffer): string => {
-      return Buffer.from(new Uint8Array(ab)).toString('utf-8');
-    };
-
-    const publicKey = isPemPublic
-      ? arrayBufferToString(publicKeyRaw)
-      : publicKeyRaw;
-    const privateKey = isPemPrivate
-      ? arrayBufferToString(privateKeyRaw)
-      : privateKeyRaw;
-
-    return { publicKey, privateKey };
+  const derConfig: KeyPairGenConfig = {
+    ...encoding,
+    publicFormat: KFormatType.DER,
+    publicType: KeyEncoding.SPKI,
+    privateFormat: KFormatType.DER,
+    privateType: KeyEncoding.PKCS8,
   };
+  const ed = new Ed(type, derConfig);
 
-  // Async path
   if (isAsync) {
     if (!callback) {
-      // This should not happen if called from public API
       throw new Error('A callback is required for async key generation.');
     }
     ed.generateKeyPair()
       .then(() => {
-        const { publicKey, privateKey } = formatKeys();
+        const { publicKey, privateKey } = ed_formatKeyPairOutput(ed, encoding);
         callback(undefined, publicKey, privateKey);
       })
       .catch(err => {
@@ -231,7 +279,6 @@ export function ed_generateKeyPair(
     return;
   }
 
-  // Sync path
   let err: Error | undefined;
   try {
     ed.generateKeyPairSync();
@@ -241,7 +288,7 @@ export function ed_generateKeyPair(
 
   const { publicKey, privateKey } = err
     ? { publicKey: undefined, privateKey: undefined }
-    : formatKeys();
+    : ed_formatKeyPairOutput(ed, encoding);
 
   if (callback) {
     callback(err, publicKey, privateKey);
@@ -374,29 +421,14 @@ export async function ed_generateKeyPairWebCrypto(
   await ed.generateKeyPair();
 
   const algorithmName = type === 'ed25519' ? 'Ed25519' : 'Ed448';
+  const { pub, priv } = ed_createKeyObjects(ed);
 
-  const publicKeyData = ed.getPublicKey();
-  const privateKeyData = ed.getPrivateKey();
-
-  const pub = KeyObject.createKeyObject(
-    'public',
-    publicKeyData,
-    KFormatType.DER,
-    KeyEncoding.SPKI,
-  ) as PublicKeyObject;
   const publicKey = new CryptoKey(
     pub,
     { name: algorithmName } as SubtleAlgorithm,
     publicUsages,
     true,
   );
-
-  const priv = KeyObject.createKeyObject(
-    'private',
-    privateKeyData,
-    KFormatType.DER,
-    KeyEncoding.PKCS8,
-  ) as PrivateKeyObjectClass;
   const privateKey = new CryptoKey(
     priv,
     { name: algorithmName } as SubtleAlgorithm,
@@ -434,29 +466,14 @@ export async function x_generateKeyPairWebCrypto(
   await ed.generateKeyPair();
 
   const algorithmName = type === 'x25519' ? 'X25519' : 'X448';
+  const { pub, priv } = ed_createKeyObjects(ed);
 
-  const publicKeyData = ed.getPublicKey();
-  const privateKeyData = ed.getPrivateKey();
-
-  const pub = KeyObject.createKeyObject(
-    'public',
-    publicKeyData,
-    KFormatType.DER,
-    KeyEncoding.SPKI,
-  ) as PublicKeyObject;
   const publicKey = new CryptoKey(
     pub,
     { name: algorithmName } as SubtleAlgorithm,
     publicUsages,
     true,
   );
-
-  const priv = KeyObject.createKeyObject(
-    'private',
-    privateKeyData,
-    KFormatType.DER,
-    KeyEncoding.PKCS8,
-  ) as PrivateKeyObjectClass;
   const privateKey = new CryptoKey(
     priv,
     { name: algorithmName } as SubtleAlgorithm,