troubleshooting

Author: boorad

example/src/hooks/useTestsList.ts

@@ -6,25 +6,6 @@ import '../tests/cipher/cipher_tests';
 import '../tests/ed25519/ed25519_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,

example/src/tests/cipher/cipher_tests.ts

@@ -7,6 +7,8 @@ import {
   type CipherType,
   type BinaryLikeNode,
   type BinaryLike,
+  type Cipher,
+  type Decipher,
 } from 'react-native-quick-crypto';
 import { expect } from 'chai';
 import { test } from '../util';
@@ -52,24 +54,24 @@ test(SUITE, 'cipher - buffers', async () => {
   );
 });
 
-// update/final
-ciphers.forEach(cipherName => {
-  test(SUITE, `cipher - non-stream - ${cipherName}`, async () => {
-    roundtrip(cipherName as CipherType, key, iv, plaintext);
-  });
-});
+// // update/final
+// ciphers.forEach(cipherName => {
+//   test(SUITE, `cipher - non-stream - ${cipherName}`, async () => {
+//     roundtrip(cipherName as CipherType, key, iv, plaintext);
+//   });
+// });
 
 function roundtrip(
   cipherName: CipherType,
   lKey: BinaryLikeNode,
   lIv: BinaryLike,
   payload: string,
 ) {
-  const cipher = createCipheriv(cipherName, lKey, lIv, {});
-  let ciph = cipher.update(payload, 'utf8', 'buffer') as Uint8Array;
-  ciph = Buffer.concat([ciph, cipher.final('buffer') as Uint8Array]);
+  const cipher: Cipher = createCipheriv(cipherName, lKey, lIv, {});
+  let ciph = cipher.update(payload, 'utf8', 'buffer');
+  ciph = Buffer.concat([ciph, cipher.final('buffer')]);
 
-  const decipher = createDecipheriv(cipherName, lKey, lIv, {});
+  const decipher: Decipher = createDecipheriv(cipherName, lKey, lIv, {});
   let deciph = decipher.update(ciph, 'buffer', 'utf8');
   deciph += decipher.final('utf8') as string;
   expect(deciph).to.equal(plaintext);

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

@@ -1,6 +1,8 @@
 #include <memory>
 #include <string>
 #include <vector>
+
+#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "HybridCipher.hpp"
@@ -109,7 +111,8 @@ HybridCipher::final() {
         ctx,
         tempBuf,
         &finalLen) != 1) {
-    throw std::runtime_error("Failed to finalize cipher");
+    throw std::runtime_error("Failed to finalize cipher: " +
+      std::to_string(ERR_get_error()));
   }
 
   // Create and return a new buffer of exact size needed

packages/react-native-quick-crypto/cpp/random/HybridRandom.cpp

@@ -50,7 +50,7 @@ HybridRandom::randomFillSync(const std::shared_ptr<ArrayBuffer>& buffer,
   size_t offset = checkOffset(dSize, dOffset);
   uint8_t* data = buffer.get()->data();
   if (RAND_bytes(data + offset, (int)size) != 1) {
-    throw std::runtime_error("error calling RAND_bytes" +
+    throw std::runtime_error("error calling RAND_bytes: " +
       std::to_string(ERR_get_error()));
   }
   return buffer;

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

@@ -78,7 +78,7 @@ class CipherCommon extends Stream.Transform {
     data: BinaryLike,
     inputEncoding?: Encoding,
     outputEncoding?: Encoding,
-  ): ArrayBuffer | string {
+  ): Buffer | string {
     const defaultEncoding = getDefaultEncoding();
     inputEncoding = inputEncoding ?? defaultEncoding;
     outputEncoding = outputEncoding ?? defaultEncoding;
@@ -98,12 +98,12 @@ class CipherCommon extends Stream.Transform {
       return this.decoder!.write(SBuffer.from(ret) as any);
     }
 
-    return ret;
+    return Buffer.from(ret);
   }
 
-  final(): ArrayBuffer;
+  final(): Buffer;
   final(outputEncoding: BufferEncoding | 'buffer'): string;
-  final(outputEncoding?: BufferEncoding | 'buffer'): ArrayBuffer | string {
+  final(outputEncoding?: BufferEncoding | 'buffer'): Buffer | string {
     const ret = this.native.final();
 
     if (outputEncoding && outputEncoding !== 'buffer') {
@@ -112,7 +112,7 @@ class CipherCommon extends Stream.Transform {
       return this.decoder!.end(SBuffer.from(ret) as any);
     }
 
-    return ret;
+    return Buffer.from(ret);
   }
 
   _transform(
@@ -184,6 +184,8 @@ class Cipheriv extends CipherCommon {
   }
 }
 
+type Cipher = CipherCCM | CipherOCB | CipherGCM | Cipheriv;
+
 class Decipheriv extends CipherCommon {
   constructor(
     cipherType: string,
@@ -201,6 +203,8 @@ class Decipheriv extends CipherCommon {
   }
 }
 
+type Decipher = DecipherCCM | DecipherOCB | DecipherGCM | Decipheriv;
+
 export function createDecipheriv(
   algorithm: CipherCCMTypes,
   key: BinaryLikeNode,
@@ -224,7 +228,7 @@ export function createDecipheriv(
   key: BinaryLikeNode,
   iv: BinaryLike,
   options?: Stream.TransformOptions,
-): DecipherCCM | DecipherOCB | DecipherGCM | Decipheriv;
+): Decipher;
 export function createDecipheriv(
   algorithm: string,
   key: BinaryLikeNode,
@@ -234,7 +238,7 @@ export function createDecipheriv(
     | CipherOCBOptions
     | CipherGCMOptions
     | Stream.TransformOptions,
-): DecipherCCM | DecipherOCB | DecipherGCM | Decipheriv {
+): Decipher {
   return new Decipheriv(
     algorithm,
     key,
@@ -266,7 +270,7 @@ export function createCipheriv(
   key: BinaryLikeNode,
   iv: BinaryLike,
   options?: Stream.TransformOptions,
-): CipherCCM | CipherOCB | CipherGCM | Cipheriv;
+): Cipher;
 export function createCipheriv(
   algorithm: string,
   key: BinaryLikeNode,
@@ -276,7 +280,7 @@ export function createCipheriv(
     | CipherOCBOptions
     | CipherGCMOptions
     | Stream.TransformOptions,
-): CipherCCM | CipherOCB | CipherGCM | Cipheriv {
+): Cipher {
   return new Cipheriv(
     algorithm,
     key,
@@ -290,3 +294,5 @@ export const cipherExports = {
   createDecipheriv,
   getCiphers,
 };
+
+export type { Cipher, Decipher };