margelo · mlecoq · Jan 12, 2026
diff --git a/packages/react-native-quick-crypto/QuickCrypto.podspec b/packages/react-native-quick-crypto/QuickCrypto.podspec
@@ -130,8 +130,7 @@ Pod::Spec.new do |s|
 
   # Add cpp subdirectories to header search paths
   cpp_headers = [
-    "\"$(PODS_TARGET_SRCROOT)/cpp/utils\"",
-    "\"$(PODS_TARGET_SRCROOT)/cpp/hkdf\"",
+    "\"$(PODS_TARGET_SRCROOT)/cpp\"",
     "\"$(PODS_TARGET_SRCROOT)/deps/ncrypto/include\"",
     "\"$(PODS_TARGET_SRCROOT)/deps/blake3/c\"",
     "\"$(PODS_TARGET_SRCROOT)/deps/fastpbkdf2\""

diff --git a/packages/react-native-quick-crypto/android/CMakeLists.txt b/packages/react-native-quick-crypto/android/CMakeLists.txt
@@ -60,21 +60,7 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/QuickCrypto+autolinkin
 # local includes
 include_directories(
   "src/main/cpp"
-  "../cpp/blake3"
-  "../cpp/cipher"
-  "../cpp/ec"
-  "../cpp/ed25519"
-  "../cpp/hash"
-  "../cpp/hkdf"
-  "../cpp/hmac"
-  "../cpp/keys"
-  "../cpp/mldsa"
-  "../cpp/pbkdf2"
-  "../cpp/random"
-  "../cpp/rsa"
-  "../cpp/sign"
-  "../cpp/scrypt"
-  "../cpp/utils"
+  "../cpp"
   "../deps/blake3/c"
   "../deps/fastpbkdf2"
   "../deps/ncrypto/include"

diff --git a/packages/react-native-quick-crypto/cpp/blake3/HybridBlake3.cpp b/packages/react-native-quick-crypto/cpp/blake3/HybridBlake3.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 #include <stdexcept>
 
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/cipher/CCMCipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/CCMCipher.cpp
@@ -1,5 +1,5 @@
 #include "CCMCipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/ChaCha20Cipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/ChaCha20Cipher.cpp
@@ -1,5 +1,5 @@
 #include "ChaCha20Cipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/ChaCha20Poly1305Cipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/ChaCha20Poly1305Cipher.cpp
@@ -1,5 +1,5 @@
 #include "ChaCha20Poly1305Cipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/GCMCipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/GCMCipher.cpp
@@ -1,5 +1,5 @@
 #include "GCMCipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <stdexcept>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/HybridCipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/HybridCipher.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "HybridCipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/HybridCipherFactory.hpp b/packages/react-native-quick-crypto/cpp/cipher/HybridCipherFactory.hpp
@@ -10,7 +10,7 @@
 #include "GCMCipher.hpp"
 #include "HybridCipherFactorySpec.hpp"
 #include "OCBCipher.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include "XSalsa20Cipher.hpp"
 
 namespace margelo::nitro::crypto {

diff --git a/packages/react-native-quick-crypto/cpp/cipher/HybridRsaCipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/HybridRsaCipher.cpp
@@ -1,6 +1,6 @@
 #include "HybridRsaCipher.hpp"
 #include "../keys/HybridKeyObjectHandle.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>

diff --git a/packages/react-native-quick-crypto/cpp/cipher/OCBCipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/OCBCipher.cpp
@@ -3,7 +3,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <cstdio>
 #include <iomanip>
 

diff --git a/packages/react-native-quick-crypto/cpp/cipher/XSalsa20Cipher.cpp b/packages/react-native-quick-crypto/cpp/cipher/XSalsa20Cipher.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept> // For std::runtime_error
 
 #include "NitroModules/ArrayBuffer.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include "XSalsa20Cipher.hpp"
 
 namespace margelo::nitro::crypto {

diff --git a/packages/react-native-quick-crypto/cpp/ec/HybridEcKeyPair.cpp b/packages/react-native-quick-crypto/cpp/ec/HybridEcKeyPair.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #include "HybridEcKeyPair.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/ec/HybridEcKeyPair.hpp b/packages/react-native-quick-crypto/cpp/ec/HybridEcKeyPair.hpp
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "HybridEcKeyPairSpec.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/ed25519/HybridEdKeyPair.hpp b/packages/react-native-quick-crypto/cpp/ed25519/HybridEdKeyPair.hpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "HybridEdKeyPairSpec.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/hash/HybridHash.cpp b/packages/react-native-quick-crypto/cpp/hash/HybridHash.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "HybridHash.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.cpp b/packages/react-native-quick-crypto/cpp/hkdf/HybridHkdf.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "HybridHkdf.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/keys/HybridKeyObjectHandle.cpp b/packages/react-native-quick-crypto/cpp/keys/HybridKeyObjectHandle.cpp
@@ -3,7 +3,7 @@
 
 #include "../utils/base64.h"
 #include "HybridKeyObjectHandle.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/evp.h>

diff --git a/packages/react-native-quick-crypto/cpp/keys/KeyObjectData.cpp b/packages/react-native-quick-crypto/cpp/keys/KeyObjectData.cpp
@@ -1,5 +1,5 @@
 #include "KeyObjectData.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <cstdio>
 #include <optional>
 

diff --git a/packages/react-native-quick-crypto/cpp/keys/KeyObjectData.hpp b/packages/react-native-quick-crypto/cpp/keys/KeyObjectData.hpp
@@ -5,7 +5,7 @@
 #include "KFormatType.hpp"
 #include "KeyEncoding.hpp"
 #include "KeyType.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 #include <ncrypto.h>
 
 namespace margelo::nitro::crypto {

diff --git a/packages/react-native-quick-crypto/cpp/mldsa/HybridMlDsaKeyPair.cpp b/packages/react-native-quick-crypto/cpp/mldsa/HybridMlDsaKeyPair.cpp
@@ -5,7 +5,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 #if OPENSSL_VERSION_NUMBER >= 0x30500000L
 #define RNQC_HAS_ML_DSA 1

diff --git a/packages/react-native-quick-crypto/cpp/pbkdf2/HybridPbkdf2.cpp b/packages/react-native-quick-crypto/cpp/pbkdf2/HybridPbkdf2.cpp
@@ -1,5 +1,5 @@
 #include "HybridPbkdf2.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/random/HybridRandom.cpp b/packages/react-native-quick-crypto/cpp/random/HybridRandom.cpp
@@ -2,7 +2,7 @@
 #include <openssl/rand.h>
 
 #include "HybridRandom.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/rsa/HybridRsaKeyPair.cpp b/packages/react-native-quick-crypto/cpp/rsa/HybridRsaKeyPair.cpp
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "HybridRsaKeyPair.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/scrypt/HybridScrypt.cpp b/packages/react-native-quick-crypto/cpp/scrypt/HybridScrypt.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "HybridScrypt.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 namespace margelo::nitro::crypto {
 

diff --git a/packages/react-native-quick-crypto/cpp/sign/HybridSignHandle.cpp b/packages/react-native-quick-crypto/cpp/sign/HybridSignHandle.cpp
@@ -2,7 +2,7 @@
 
 #include "../keys/HybridKeyObjectHandle.hpp"
 #include "SignUtils.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>

diff --git a/packages/react-native-quick-crypto/cpp/sign/HybridVerifyHandle.cpp b/packages/react-native-quick-crypto/cpp/sign/HybridVerifyHandle.cpp
@@ -2,7 +2,7 @@
 
 #include "../keys/HybridKeyObjectHandle.hpp"
 #include "SignUtils.hpp"
-#include "Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <cstring>
 #include <openssl/err.h>

diff --git a/packages/react-native-quick-crypto/nitrogen/generated/android/QuickCryptoOnLoad.cpp b/packages/react-native-quick-crypto/nitrogen/generated/android/QuickCryptoOnLoad.cpp