cipher init works, js internals closer to recent node updates

Author: boorad

example/src/tests/cipher/cipher_tests.ts

@@ -1,5 +1,4 @@
 import {
-  Cipher,
   getCiphers,
   createCipheriv,
   randomFillSync,
@@ -12,8 +11,9 @@ const key = 'secret';
 const iv = randomFillSync(new Uint8Array(16));
 
 test(SUITE, 'cipher - valid algorithm', async () => {
-  const cipher = createCipheriv('aes-128-cbc', key, iv, {});
-  expect(cipher).to.be.instanceOf(Cipher);
+  expect(() => {
+    createCipheriv('aes-128-cbc', key, iv, {});
+  }).to.not.throw();
 });
 
 test(SUITE, 'cipher - invalid algorithm', async () => {

packages/react-native-quick-crypto/cpp/cipher/HybridCipher.cpp

@@ -7,6 +7,15 @@
 
 namespace margelo::nitro::crypto {
 
+HybridCipher::~HybridCipher() {
+  if (this->ctx) {
+    EVP_CIPHER_CTX_free(this->ctx);
+  }
+  if (this->cipher) {
+    EVP_CIPHER_free(this->cipher);
+  }
+}
+
 std::shared_ptr<ArrayBuffer>
 HybridCipher::update(
   const std::shared_ptr<ArrayBuffer>& data
@@ -65,12 +74,39 @@ HybridCipher::init() {
   }
   auto args = this->args.value();
 
-  // check if cipherType is valid
-  const EVP_CIPHER *const cipher = EVP_get_cipherbyname(args.cipherType.c_str());
+  // fetch cipher
+  this->cipher = EVP_CIPHER_fetch(
+    nullptr,
+    args.cipherType.c_str(),
+    nullptr
+  );
   if (cipher == nullptr) {
     throw std::runtime_error("Invalid Cipher Algorithm: " + args.cipherType);
   }
 
+  // Create cipher context
+  this->ctx = EVP_CIPHER_CTX_new();
+  if (!this->ctx) {
+    throw std::runtime_error("Failed to create cipher context");
+  }
+
+  // Initialize cipher operation
+  if (
+    EVP_CipherInit_ex2(
+      this->ctx,
+      this->cipher,
+      this->args->cipherKey->data(),
+      this->args->iv->data(),
+      this->args->isCipher ? 1 : 0,
+      nullptr
+    ) != 1
+  ) {
+    EVP_CIPHER_CTX_free(this->ctx);
+    this->ctx = nullptr;
+    throw std::runtime_error("Failed to initialize encryption");
+  }
+}
+
 void collect_ciphers(EVP_CIPHER *cipher, void *arg) {
   auto ciphers = static_cast<std::vector<std::string>*>(arg);
   const char* name = EVP_CIPHER_get0_name(cipher);

packages/react-native-quick-crypto/cpp/cipher/HybridCipher.hpp

@@ -14,6 +14,7 @@ using namespace facebook;
 class HybridCipher : public HybridCipherSpec {
  public:
   HybridCipher() : HybridObject(TAG) {}
+  ~HybridCipher();
 
  public:
   // Methods
@@ -62,6 +63,8 @@ class HybridCipher : public HybridCipherSpec {
  private:
   // Properties
   std::optional<CipherArgs> args = std::nullopt;
+  EVP_CIPHER_CTX *ctx = nullptr;
+  EVP_CIPHER *cipher = nullptr;
 };
 
 } // namespace margelo::nitro::crypto

packages/react-native-quick-crypto/src/cipher.ts

@@ -29,7 +29,8 @@ import {
 } from './utils/cipher';
 
 class CipherUtils {
-  private static native = NitroModules.createHybridObject<NativeCipher>('Cipher');
+  private static native =
+    NitroModules.createHybridObject<NativeCipher>('Cipher');
   public static getSupportedCiphers(): string[] {
     return this.native.getSupportedCiphers();
   }
@@ -40,23 +41,23 @@ export function getCiphers(): string[] {
 }
 
 interface CipherArgs {
+  isCipher: boolean;
   cipherType: string;
   cipherKey: BinaryLikeNode;
-  isCipher: boolean;
-  options: Record<string, TransformOptions>;
   iv: BinaryLike;
-};
+  options: Record<string, TransformOptions>;
+}
 
 class CipherCommon extends Stream.Transform {
   private native: NativeCipher;
   private decoder: StringDecoder | undefined;
 
   constructor({
+    isCipher,
     cipherType,
     cipherKey,
-    isCipher,
-    options = {},
     iv,
+    options = {},
   }: CipherArgs) {
     super(options);
     this.native = NitroModules.createHybridObject<NativeCipher>('Cipher');
@@ -166,35 +167,35 @@ class CipherCommon extends Stream.Transform {
   }
 }
 
-export class Cipher extends CipherCommon {
+class Cipheriv extends CipherCommon {
   constructor(
     cipherType: string,
     cipherKey: BinaryLikeNode,
-    options: Record<string, TransformOptions> = {},
     iv: BinaryLike,
+    options: Record<string, TransformOptions> = {},
   ) {
     super({
+      isCipher: true,
       cipherType,
       cipherKey: binaryLikeToArrayBuffer(cipherKey),
       iv: binaryLikeToArrayBuffer(iv),
-      isCipher: true,
       options,
     });
   }
 }
 
-export class Decipher extends CipherCommon {
+class Decipheriv extends CipherCommon {
   constructor(
     cipherType: string,
     cipherKey: BinaryLikeNode,
-    options: Record<string, TransformOptions> = {},
     iv: BinaryLike,
+    options: Record<string, TransformOptions> = {},
   ) {
     super({
+      isCipher: false,
       cipherType,
       cipherKey: binaryLikeToArrayBuffer(cipherKey),
       iv: binaryLikeToArrayBuffer(iv),
-      isCipher: false,
       options,
     });
   }
@@ -223,7 +224,7 @@ export function createDecipheriv(
   key: BinaryLikeNode,
   iv: BinaryLike,
   options?: Stream.TransformOptions,
-): DecipherCCM | DecipherOCB | DecipherGCM | Decipher;
+): DecipherCCM | DecipherOCB | DecipherGCM | Decipheriv;
 export function createDecipheriv(
   algorithm: string,
   key: BinaryLikeNode,
@@ -233,12 +234,12 @@ export function createDecipheriv(
     | CipherOCBOptions
     | CipherGCMOptions
     | Stream.TransformOptions,
-): DecipherCCM | DecipherOCB | DecipherGCM | Decipher {
-  return new Decipher(
+): DecipherCCM | DecipherOCB | DecipherGCM | Decipheriv {
+  return new Decipheriv(
     algorithm,
     key,
-    options as Record<string, TransformOptions>,
     iv,
+    options as Record<string, TransformOptions>,
   );
 }
 
@@ -265,7 +266,7 @@ export function createCipheriv(
   key: BinaryLikeNode,
   iv: BinaryLike,
   options?: Stream.TransformOptions,
-): CipherCCM | CipherOCB | CipherGCM | Cipher;
+): CipherCCM | CipherOCB | CipherGCM | Cipheriv;
 export function createCipheriv(
   algorithm: string,
   key: BinaryLikeNode,
@@ -275,11 +276,11 @@ export function createCipheriv(
     | CipherOCBOptions
     | CipherGCMOptions
     | Stream.TransformOptions,
-): CipherCCM | CipherOCB | CipherGCM | Cipher {
-  return new Cipher(
+): CipherCCM | CipherOCB | CipherGCM | Cipheriv {
+  return new Cipheriv(
     algorithm,
     key,
-    options as Record<string, TransformOptions>,
     iv,
+    options as Record<string, TransformOptions>,
   );
 }