fix: add smart pointer headers and vector ToNativeArrayBuffer overload

Author: boorad

packages/react-native-quick-crypto/cpp/dh/HybridDiffieHellman.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <openssl/dh.h>
 #include <openssl/evp.h>
 #include <string>
 #include <vector>
@@ -12,15 +13,12 @@ namespace margelo::nitro::crypto {
 using namespace facebook;
 using margelo::nitro::ArrayBuffer;
 
+using EVP_PKEY_ptr = std::unique_ptr<EVP_PKEY, decltype(&EVP_PKEY_free)>;
+
 class HybridDiffieHellman : public HybridDiffieHellmanSpec {
  public:
-  HybridDiffieHellman() : HybridObject("DiffieHellman") {}
-  virtual ~HybridDiffieHellman() {
-    if (_pkey) {
-      EVP_PKEY_free(_pkey);
-      _pkey = nullptr;
-    }
-  }
+  HybridDiffieHellman() : HybridObject("DiffieHellman"), _pkey(nullptr, EVP_PKEY_free) {}
+  virtual ~HybridDiffieHellman() = default;
 
   void init(const std::shared_ptr<ArrayBuffer>& prime, const std::shared_ptr<ArrayBuffer>& generator) override;
   void initWithSize(double primeLength, double generator) override;
@@ -34,9 +32,10 @@ class HybridDiffieHellman : public HybridDiffieHellmanSpec {
   void setPrivateKey(const std::shared_ptr<ArrayBuffer>& privateKey) override;
 
  private:
-  EVP_PKEY* _pkey = nullptr;
+  EVP_PKEY_ptr _pkey;
 
-  void ensureInitialized();
+  void ensureInitialized() const;
+  const DH* getDH() const;
 };
 
 } // namespace margelo::nitro::crypto

packages/react-native-quick-crypto/cpp/ecdh/HybridECDH.hpp

@@ -3,7 +3,6 @@
 #include <memory>
 #include <openssl/ec.h>
 #include <openssl/evp.h>
-
 #include <string>
 #include <vector>
 
@@ -14,19 +13,13 @@ namespace margelo::nitro::crypto {
 using namespace facebook;
 using margelo::nitro::ArrayBuffer;
 
+using EVP_PKEY_ptr = std::unique_ptr<EVP_PKEY, decltype(&EVP_PKEY_free)>;
+using EC_GROUP_ptr = std::unique_ptr<EC_GROUP, decltype(&EC_GROUP_free)>;
+
 class HybridECDH : public HybridECDHSpec {
  public:
-  HybridECDH() : HybridObject("ECDH") {}
-  virtual ~HybridECDH() {
-    if (_pkey) {
-      EVP_PKEY_free(_pkey);
-      _pkey = nullptr;
-    }
-    if (_group) {
-      EC_GROUP_free(_group);
-      _group = nullptr;
-    }
-  }
+  HybridECDH() : HybridObject("ECDH"), _pkey(nullptr, EVP_PKEY_free), _group(nullptr, EC_GROUP_free) {}
+  virtual ~HybridECDH() = default;
 
   void init(const std::string& curveName) override;
   std::shared_ptr<ArrayBuffer> generateKeys() override;
@@ -37,13 +30,13 @@ class HybridECDH : public HybridECDHSpec {
   void setPublicKey(const std::shared_ptr<ArrayBuffer>& publicKey) override;
 
  private:
-  EVP_PKEY* _pkey = nullptr;
-  EC_GROUP* _group = nullptr;
+  EVP_PKEY_ptr _pkey;
+  EC_GROUP_ptr _group;
   std::string _curveName;
   int _curveNid = 0;
 
-  void ensureInitialized();
-  int getCurveNid(const std::string& name);
+  void ensureInitialized() const;
+  static int getCurveNid(const std::string& name);
 };
 
 } // namespace margelo::nitro::crypto

packages/react-native-quick-crypto/cpp/utils/QuickCryptoUtils.hpp

@@ -5,6 +5,7 @@
 #include <limits>
 #include <openssl/err.h>
 #include <string>
+#include <vector>
 
 #include "Macros.hpp"
 #include <NitroModules/ArrayBuffer.hpp>
@@ -44,6 +45,19 @@ inline std::shared_ptr<margelo::nitro::NativeArrayBuffer> ToNativeArrayBuffer(st
   return std::make_shared<margelo::nitro::NativeArrayBuffer>(data, size, [=]() { delete[] data; });
 }
 
+inline std::shared_ptr<margelo::nitro::NativeArrayBuffer> ToNativeArrayBuffer(const std::vector<uint8_t>& vec) {
+  size_t size = vec.size();
+  uint8_t* data = new uint8_t[size];
+  memcpy(data, vec.data(), size);
+  return std::make_shared<margelo::nitro::NativeArrayBuffer>(data, size, [=]() { delete[] data; });
+}
+
+inline std::shared_ptr<margelo::nitro::NativeArrayBuffer> ToNativeArrayBuffer(const uint8_t* ptr, size_t size) {
+  uint8_t* data = new uint8_t[size];
+  memcpy(data, ptr, size);
+  return std::make_shared<margelo::nitro::NativeArrayBuffer>(data, size, [=]() { delete[] data; });
+}
+
 inline bool CheckIsUint32(double value) {
   return (value >= std::numeric_limits<uint32_t>::lowest() && value <= std::numeric_limits<uint32_t>::max());
 }