margelo · boorad · Jan 3, 2025 · Jan 3, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/.gitignore b/.gitignore
@@ -186,4 +186,4 @@ tsconfig.tsbuildinfo
 
 # development stuffs
 *scratch*
-
+.*rules*
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -1 +1 @@
-filter=-build/namespaces,-legal/copyright,-build/header_guard,-readability/casting,-runtime/references,-whitespace/newline,-build/c++11,-build/include_subdir,-whitespace/comments,-runtime/int,-runtime/printf
+filter=-build/namespaces,-legal/copyright,-build/header_guard,-readability/casting,-runtime/references,-whitespace/newline,-build/c++11,-build/include_subdir,-whitespace/comments,-runtime/int,-runtime/printf,-whitespace/blank_line
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ QuickCrypto can be used as a drop-in replacement for your Web3/Crypto apps to sp
 
 | Version | RN Architecture | Modules |
 | ------- | ------ | ------- |
-| `1.x`     | new [->](https://github.com/reactwg/react-native-new-architecture/blob/main/docs/enable-apps.md)  | Nitro Modules [->](https://github.com/margelo/react-native-nitro) |
+| `1.x`     | new [->](https://github.com/reactwg/react-native-new-architecture/blob/main/docs/enable-apps.md)  | Nitro Modules [->](https://github.com/mrousavy/nitro) |
 | `0.x`     | old  | Bridge & JSI |
 
 ## Benchmarks

diff --git a/bun.lock b/bun.lock
@@ -10,7 +10,7 @@
     },
     "example": {
       "name": "react-native-quick-crypto-example",
-      "version": "1.0.0-beta.12",
+      "version": "1.0.0-beta.13",
       "dependencies": {
         "@craftzdog/react-native-buffer": "6.0.5",
         "@noble/curves": "^1.7.0",
@@ -25,10 +25,10 @@
         "events": "3.3.0",
         "react": "18.3.1",
         "react-native": "0.76.1",
-        "react-native-bouncy-checkbox": "4.0.1",
+        "react-native-bouncy-checkbox": "4.1.2",
         "react-native-nitro-modules": "0.21.0",
         "react-native-quick-base64": "2.1.2",
-        "react-native-quick-crypto": "1.0.0-beta.12",
+        "react-native-quick-crypto": "workspace:*",
         "react-native-safe-area-context": "5.1.0",
         "react-native-screens": "3.35.0",
         "react-native-vector-icons": "^10.1.0",
@@ -69,13 +69,12 @@
     },
     "packages/react-native-quick-crypto": {
       "name": "react-native-quick-crypto",
-      "version": "1.0.0-beta.12",
+      "version": "1.0.0-beta.13",
       "dependencies": {
         "@craftzdog/react-native-buffer": "6.0.5",
         "events": "3.3.0",
         "react-native-quick-base64": "2.1.2",
         "readable-stream": "4.5.2",
-        "string_decoder": "1.3.0",
         "util": "0.12.5",
       },
       "devDependencies": {
@@ -1871,7 +1870,7 @@
 
     "react-native": ["[email protected]", "", { "dependencies": { "@jest/create-cache-key-function": "^29.6.3", "@react-native/assets-registry": "0.76.1", "@react-native/codegen": "0.76.1", "@react-native/community-cli-plugin": "0.76.1", "@react-native/gradle-plugin": "0.76.1", "@react-native/js-polyfills": "0.76.1", "@react-native/normalize-colors": "0.76.1", "@react-native/virtualized-lists": "0.76.1", "abort-controller": "^3.0.0", "anser": "^1.4.9", "ansi-regex": "^5.0.0", "babel-jest": "^29.7.0", "babel-plugin-syntax-hermes-parser": "^0.23.1", "base64-js": "^1.5.1", "chalk": "^4.0.0", "commander": "^12.0.0", "event-target-shim": "^5.0.1", "flow-enums-runtime": "^0.0.6", "glob": "^7.1.1", "invariant": "^2.2.4", "jest-environment-node": "^29.6.3", "jsc-android": "^250231.0.0", "memoize-one": "^5.0.0", "metro-runtime": "^0.81.0", "metro-source-map": "^0.81.0", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "pretty-format": "^29.7.0", "promise": "^8.3.0", "react-devtools-core": "^5.3.1", "react-refresh": "^0.14.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.24.0-canary-efb381bbf-20230505", "semver": "^7.1.3", "stacktrace-parser": "^0.1.10", "whatwg-fetch": "^3.0.0", "ws": "^6.2.3", "yargs": "^17.6.2" }, "peerDependencies": { "@types/react": "^18.2.6", "react": "^18.2.0" }, "optionalPeers": ["@types/react"], "bin": { "react-native": "cli.js" } }, "sha512-z4KnbrnnAvloRs9NGnah3u6/LK3IbtNMrvByxa3ifigbMlsMY4WPRYV9lvt/hH4Mzt8bfuI+utnOxFyJTTq3lg=="],
 
-    "react-native-bouncy-checkbox": ["react-native-bouncy-checkbox@4.0.1", "", { "dependencies": { "@freakycoder/react-native-bounceable": "^1.0.3" } }, "sha512-dlywsd3PWF47tkZKWFtnArtGM66Hkk1iUvlQhxSbnI56eo8BaQ4VnGFsrGxA3Jc/B7KDuzS9RCtaEflJJT5gYA=="],
+    "react-native-bouncy-checkbox": ["react-native-bouncy-checkbox@4.1.2", "", { "dependencies": { "@freakycoder/react-native-bounceable": "^1.0.3" } }, "sha512-hB7YwCGTNoMpTPOPiP+RWyQH35S6vxUbc7IGEW/Rqyp7GonEyhtqtthmxiphneRXnywMh8CZwND7OnvppJZscg=="],
 
     "react-native-builder-bob": ["[email protected]", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-transform-strict-mode": "^7.24.7", "@babel/preset-env": "^7.25.2", "@babel/preset-flow": "^7.24.7", "@babel/preset-react": "^7.24.7", "@babel/preset-typescript": "^7.24.7", "babel-plugin-module-resolver": "^5.0.2", "browserslist": "^4.20.4", "cosmiconfig": "^9.0.0", "cross-spawn": "^7.0.3", "dedent": "^0.7.0", "del": "^6.1.1", "escape-string-regexp": "^4.0.0", "fs-extra": "^10.1.0", "glob": "^8.0.3", "is-git-dirty": "^2.0.1", "json5": "^2.2.1", "kleur": "^4.1.4", "metro-config": "^0.80.9", "prompts": "^2.4.2", "which": "^2.0.2", "yargs": "^17.5.1" }, "bin": { "bob": "bin/bob" } }, "sha512-/ehbjzO2GhDd8/noZiZVEGAVDkyZuWJ+zOrKcrNpqpoLOWhCO4y10FGIRkl5bfLvy7/2kXTwI6YnwiGIOODSGQ=="],
 

diff --git a/bun.lockb b/bun.lockb
diff --git a/docs/implementation-coverage.md b/docs/implementation-coverage.md
@@ -12,18 +12,18 @@ This document attempts to describe the implementation status of Crypto APIs/Inte
    * ❌ Static method: `Certificate.exportChallenge(spkac[, encoding])`
    * ❌ Static method: `Certificate.exportPublicKey(spkac[, encoding])`
    * ❌ Static method: `Certificate.verifySpkac(spkac[, encoding])`
-* ❌ Class: `Cipher`
-  * ❌ `cipher.final([outputEncoding])`
-  * ❌ `cipher.getAuthTag()`
-  * ❌ `cipher.setAAD(buffer[, options])`
-  * ❌ `cipher.setAutoPadding([autoPadding])`
-  * ❌ `cipher.update(data[, inputEncoding][, outputEncoding])`
-* ❌ Class: `Decipher`
-  * ❌ `decipher.final([outputEncoding])`
-  * ❌ `decipher.setAAD(buffer[, options])`
-  * ❌ `decipher.setAuthTag(buffer[, encoding])`
-  * ❌ `decipher.setAutoPadding([autoPadding])`
-  * ❌ `decipher.update(data[, inputEncoding][, outputEncoding])`
+* ✅ Class: `Cipher`
+  * ✅ `cipher.final([outputEncoding])`
+  * ✅ `cipher.getAuthTag()`
+  * ✅ `cipher.setAAD(buffer[, options])`
+  * ✅ `cipher.setAutoPadding([autoPadding])`
+  * ✅ `cipher.update(data[, inputEncoding][, outputEncoding])`
+* ✅ Class: `Decipher`
+  * ✅ `decipher.final([outputEncoding])`
+  * ✅ `decipher.setAAD(buffer[, options])`
+  * ✅ `decipher.setAuthTag(buffer[, encoding])`
+  * ✅ `decipher.setAutoPadding([autoPadding])`
+  * ✅ `decipher.update(data[, inputEncoding][, outputEncoding])`
 * ❌ Class: `DiffieHellman`
   * ❌ `diffieHellman.computeSecret(otherPublicKey[, inputEncoding][, outputEncoding])`
   * ❌ `diffieHellman.generateKeys([encoding])`
@@ -95,8 +95,8 @@ This document attempts to describe the implementation status of Crypto APIs/Inte
   * ❌ `crypto.fips`
   * ❌ `crypto.checkPrime(candidate[, options], callback)`
   * ❌ `crypto.checkPrimeSync(candidate[, options])`
-  * ❌ `crypto.createCipheriv(algorithm, key, iv[, options])`
-  * ❌ `crypto.createDecipheriv(algorithm, key, iv[, options])`
+  * ✅ `crypto.createCipheriv(algorithm, key, iv[, options])`
+  * ✅ `crypto.createDecipheriv(algorithm, key, iv[, options])`
   * ❌ `crypto.createDiffieHellman(prime[, primeEncoding][, generator][, generatorEncoding])`
   * ❌ `crypto.createDiffieHellman(primeLength[, generator])`
   * ❌ `crypto.createDiffieHellmanGroup(name)`
@@ -117,7 +117,7 @@ This document attempts to describe the implementation status of Crypto APIs/Inte
   * ❌ `crypto.generatePrime(size[, options[, callback]])`
   * ❌ `crypto.generatePrimeSync(size[, options])`
   * ❌ `crypto.getCipherInfo(nameOrNid[, options])`
-  * ❌ `crypto.getCiphers()`
+  * ✅ `crypto.getCiphers()`
   * ❌ `crypto.getCurves()`
   * ❌ `crypto.getDiffieHellman(groupName)`
   * ❌ `crypto.getFips()`

diff --git a/example/package.json b/example/package.json
@@ -33,10 +33,10 @@
     "events": "3.3.0",
     "react": "18.3.1",
     "react-native": "0.76.1",
-    "react-native-bouncy-checkbox": "4.0.1",
+    "react-native-bouncy-checkbox": "4.1.2",
     "react-native-nitro-modules": "0.21.0",
     "react-native-quick-base64": "2.1.2",
-    "react-native-quick-crypto": "1.0.0-beta.13",
+    "react-native-quick-crypto": "workspace:*",
     "react-native-safe-area-context": "5.1.0",
     "react-native-screens": "3.35.0",
     "react-native-vector-icons": "^10.1.0",

diff --git a/example/src/hooks/useTestsList.ts b/example/src/hooks/useTestsList.ts
@@ -2,28 +2,12 @@ import { useState, useCallback } from 'react';
 import type { TestSuites } from '../types/tests';
 import { TestsContext } from '../tests/util';
 
-import '../tests/hmac/hmac_tests';
-import '../tests/hash/hash_tests';
+import '../tests/cipher/cipher_tests';
 import '../tests/ed25519/ed25519_tests';
+import '../tests/hash/hash_tests';
+import '../tests/hmac/hmac_tests';
 import '../tests/pbkdf2/pbkdf2_tests';
 import '../tests/random/random_tests';
-// import '../tests/HmacTests/HmacTests';
-// import '../tests/HashTests/HashTests';
-// import '../tests/CipherTests/CipherTestFirst';
-// import '../tests/CipherTests/CipherTestSecond';
-// import '../tests/CipherTests/PublicCipherTests';
-// import '../tests/CipherTests/test398';
-// import '../tests/CipherTests/generateKey';
-// import '../tests/CipherTests/GenerateKeyPairTests';
-// import '../tests/ConstantsTests/ConstantsTests';
-// import '../tests/SignTests/SignTests';
-// import '../tests/SmokeTests/bundlerTests';
-// import '../tests/webcryptoTests/deriveBits';
-// import '../tests/webcryptoTests/digest';
-// import '../tests/webcryptoTests/generateKey';
-// import '../tests/webcryptoTests/encrypt_decrypt';
-// import '../tests/webcryptoTests/import_export';
-// import '../tests/webcryptoTests/sign_verify';
 
 export const useTestsList = (): [
   TestSuites,

diff --git a/example/src/hooks/useTestsRun.ts b/example/src/hooks/useTestsRun.ts
@@ -84,96 +84,3 @@ const run = (
   stats.duration = stats.end.valueOf() - stats.start.valueOf();
   return stats;
 };
-
-// const run = (
-//   addTestResult: (testResult: TestResult) => void,
-//   tests: Suites = {},
-// ) => {
-//   const {
-//     EVENT_RUN_BEGIN,
-//     EVENT_RUN_END,
-//     EVENT_TEST_FAIL,
-//     EVENT_TEST_PASS,
-//     EVENT_TEST_PENDING,
-//     EVENT_TEST_END,
-//     EVENT_SUITE_BEGIN,
-//     EVENT_SUITE_END,
-//   } = Mocha.Runner.constants;
-
-//   const stats: Stats = { ...defaultStats };
-
-//   const runner = new Mocha.Runner(rootSuite);
-//   runner.stats = stats;
-
-//   // enable/disable tests based on checkbox value
-//   runner.suite.suites.map(s => {
-//     const suiteName = s.title;
-//     if (!tests[suiteName]?.value) {
-//       // console.log(`skipping '${suiteName}' suite`);
-//       s.tests.map(t => {
-//         t.skip();
-//       });
-//     } else {
-//       // console.log(`will run '${suiteName}' suite`);
-//       s.tests.map(t => {
-//         // @ts-expect-error - not sure why this is erroring
-//         t.reset();
-//       });
-//     }
-//   });
-
-//   let indents = -1;
-//   const indent = () => Array(indents).join('  ');
-//   runner
-//     .once(EVENT_RUN_BEGIN, () => {
-//       stats.start = new Date();
-//     })
-//     .on(EVENT_SUITE_BEGIN, (suite: MochaTypes.Suite) => {
-//       if (!suite.root) stats.suites++;
-//       indents++;
-//     })
-//     .on(EVENT_SUITE_END, () => {
-//       indents--;
-//     })
-//     .on(EVENT_TEST_PASS, (test: MochaTypes.Runnable) => {
-//       const name = test.parent?.title || '';
-//       stats.passes++;
-//       addTestResult({
-//         indentation: indents,
-//         description: test.title,
-//         suiteName: name,
-//         type: 'correct',
-//       });
-//       console.log(`${indent()}pass: ${test.title}`);
-//     })
-//     .on(EVENT_TEST_FAIL, (test: MochaTypes.Runnable, err: Error) => {
-//       const name = test.parent?.title || '';
-//       stats.failures++;
-//       addTestResult({
-//         indentation: indents,
-//         description: test.title,
-//         suiteName: name,
-//         type: 'incorrect',
-//         errorMsg: err.message,
-//       });
-//       console.log(`${indent()}fail: ${test.title} - error: ${err.message}`);
-//     })
-//     .on(EVENT_TEST_PENDING, function () {
-//       stats.pending++;
-//     })
-//     .on(EVENT_TEST_END, function () {
-//       stats.tests++;
-//     })
-//     .once(EVENT_RUN_END, () => {
-//       stats.end = new Date();
-//       stats.duration = stats.end.valueOf() - stats.start.valueOf();
-//       console.log(JSON.stringify(runner.stats, null, 2));
-//     });
-
-//   runner.run();
-
-//   return () => {
-//     console.log('aborting');
-//     runner.abort();
-//   };
-// };
diff --git a/example/src/tests/cipher/cipher_tests.ts b/example/src/tests/cipher/cipher_tests.ts
@@ -0,0 +1,102 @@
+import { Buffer } from '@craftzdog/react-native-buffer';
+import {
+  getCiphers,
+  createCipheriv,
+  createDecipheriv,
+  randomFillSync,
+  type BinaryLikeNode,
+  type BinaryLike,
+  type Cipher,
+  type Decipher,
+} from 'react-native-quick-crypto';
+import { expect } from 'chai';
+import { test } from '../util';
+
+const SUITE = 'cipher';
+const ciphers = getCiphers()
+  .filter((c) => c.includes('CCM'))
+  // .filter((c) => c.includes('CCM') || c.includes('OCB') || c.includes('SIV'))
+;
+// const ciphers = ['AES-128-GCM'];
+const key = randomFillSync(new Uint8Array(32));
+// CCM mode requires IV length between 7-13 bytes
+// OCB mode requires IV length <= 15 bytes
+const iv12 = randomFillSync(new Uint8Array(12));
+// Other modes use 16 bytes
+const iv16 = randomFillSync(new Uint8Array(16));
+const aad = Buffer.from('0001020304050607', 'hex');
+const plaintext =
+  '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
+  'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
+  'jAfaFg**';
+const ciphertext = Buffer.from(plaintext, 'utf8');
+
+// test(SUITE, 'valid algorithm', () => {
+//   expect(() => {
+//     createCipheriv('aes-128-cbc', key, iv, {});
+//   }).to.not.throw();
+// });
+
+// test(SUITE, 'invalid algorithm', () => {
+//   expect(() => {
+//     createCipheriv('aes-128-boorad', key, iv, {});
+//   }).to.throw(/Invalid Cipher Algorithm: aes-128-boorad/);
+// });
+
+// test(SUITE, 'getSupportedCiphers', () => {
+//   expect(ciphers).to.be.instanceOf(Array);
+//   expect(ciphers).to.have.length.greaterThan(0);
+// });
+
+// // different value types
+// test(SUITE, 'strings', () => {
+//   roundtrip('aes-128-cbc', '0123456789abcd0123456789', '12345678', plaintext);
+// });
+
+// test(SUITE, 'buffers', () => {
+//   roundtrip(
+//     'aes-128-cbc',
+//     Buffer.from('0123456789abcd0123456789'),
+//     Buffer.from('12345678'),
+//     ciphertext,
+//   );
+// });
+
+// update/final
+ciphers.forEach(cipherName => {
+  test(SUITE, `non-stream - ${cipherName}`, () => {
+    // Use 12-byte IV for CCM mode, 16-byte for others
+    const testIv = cipherName.includes('CCM') || cipherName.includes('OCB')
+      ? iv12
+      : iv16;
+    roundtrip(cipherName, key, testIv, ciphertext);
+  });
+});
+
+function roundtrip(
+  cipherName: string,
+  lKey: BinaryLikeNode,
+  lIv: BinaryLike,
+  payload: Buffer,
+) {
+  const cipher: Cipher = createCipheriv(cipherName, lKey, lIv, {});
+  let ciph = cipher.update(payload, 'utf8', 'buffer') as Buffer;
+  ciph = Buffer.concat([ciph, cipher.final()]);
+
+  const decipher: Decipher = createDecipheriv(cipherName, lKey, lIv, {});
+  if (
+    cipherName.includes('CCM') ||
+    cipherName.includes('OCB') ||
+    cipherName.includes('SIV')
+  ) {
+    // For OCB and SIV modes, we need to get and set the auth tag
+    const tag = cipher.getAuthTag();
+    decipher.setAuthTag(tag);
+  }
+
+  let deciph = decipher.update(ciph, 'buffer', 'utf8');
+  deciph += decipher.final('utf8') as string;
+  // console.log('actual  ', deciph);
+  // console.log('expected', plaintext);
+  expect(deciph).to.equal(plaintext);
+}
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "specs": "bun --filter='react-native-quick-crypto' specs",
     "bundle-install": "bun --filter='react-native-quick-crypto-example' bundle-install",
     "pods": "bun --filter='react-native-quick-crypto-example' pods",
-    "start": "bun --filter='react-native-quick-crypto-example' start",
+    "start": "cd example && bun start",
     "bootstrap": "bun install && bun pods",
     "tsc": "bun --filter='*' typescript",
     "lint": "bun --filter='*' lint",

diff --git a/packages/react-native-quick-crypto/android/CMakeLists.txt b/packages/react-native-quick-crypto/android/CMakeLists.txt
@@ -9,9 +9,10 @@ set(CMAKE_CXX_STANDARD 20)
 add_library(
   ${PACKAGE_NAME} SHARED
   src/main/cpp/cpp-adapter.cpp
-  ../cpp/hmac/HybridHmac.cpp
-  ../cpp/hash/HybridHash.cpp
+  ../cpp/cipher/HybridCipher.cpp
   ../cpp/ed25519/HybridEdKeyPair.cpp
+  ../cpp/hash/HybridHash.cpp
+  ../cpp/hmac/HybridHmac.cpp
   ../cpp/pbkdf2/HybridPbkdf2.cpp
   ../cpp/random/HybridRandom.cpp
   ../deps/fastpbkdf2/fastpbkdf2.c
@@ -23,9 +24,10 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/QuickCrypto+autolinkin
 # local includes
 include_directories(
   "src/main/cpp"
-  "../cpp/hmac"
-  "../cpp/hash"
+  "../cpp/cipher"
   "../cpp/ed25519"
+  "../cpp/hash"
+  "../cpp/hmac"
   "../cpp/pbkdf2"
   "../cpp/random"
   "../cpp/utils"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -186,4 +186,4 @@ tsconfig.tsbuildinfo

		# development stuffs
		scratch

		.rules
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		filter=-build/namespaces,-legal/copyright,-build/header_guard,-readability/casting,-runtime/references,-whitespace/newline,-build/c++11,-build/include_subdir,-whitespace/comments,-runtime/int,-runtime/printf
		filter=-build/namespaces,-legal/copyright,-build/header_guard,-readability/casting,-runtime/references,-whitespace/newline,-build/c++11,-build/include_subdir,-whitespace/comments,-runtime/int,-runtime/printf,-whitespace/blank_line