commit cfad98d1e810b09a8377afc535b9d21325d14b6b
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Sun Oct 11 11:25:14 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Sun Oct 11 11:25:14 2020 -0700
tree d8a608fa7726b8f0cbac5d14983dfd8e67865bf0
parent 3243728b44f03aeea853b2abb1ea0dae3466dd82

move ECDH_CTX into cpp

Change-Id: Ib28e0d0586f9e89fe2aaaaa3c6311ffd0325f8ad

src/crypto-support/crypto-helper.hpp

diff --git a/src/crypto-support/crypto-helper.hpp b/src/crypto-support/crypto-helper.hpp
index 3af83af..eb4122c 100644
--- a/src/crypto-support/crypto-helper.hpp
+++ b/src/crypto-support/crypto-helper.hpp
@@ -37,19 +37,6 @@
   using std::runtime_error::runtime_error;
 };
 
-struct ECDH_CTX {
-  int EC_NID;
-  EVP_PKEY_CTX* ctx_params;
-  EVP_PKEY_CTX* ctx_keygen;
-  EVP_PKEY* privkey;
-  EVP_PKEY* peerkey;
-  EVP_PKEY* params;
-  uint8_t publicKey[256];
-  int publicKeyLen;
-  uint8_t sharedSecret[256];
-  int sharedSecretLen;
-};
-
 class ECDHState {
 public:
   ECDHState();
@@ -61,7 +48,10 @@
   uint8_t*
   deriveSecret(const std::string& peerKeyStr);
 
-  unique_ptr<ECDH_CTX> context;
+  uint8_t m_publicKey[256];
+  size_t m_publicKeyLen;
+  uint8_t m_sharedSecret[256];
+  size_t m_sharedSecretLen;
 
 PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   uint8_t*
@@ -69,6 +59,10 @@
 
   uint8_t*
   getRawSelfPubKey();
+
+private:
+  struct ECDH_CTX;
+  unique_ptr<ECDH_CTX> context;
 };
 
 /**