Merge branch 'remove-network'

* remove-network:
  Remove remote-host and port options
  Remove Socket class

1 files changed, 3 insertions, 4 deletions

diff --git a/Cryptor.h b/Cryptor.h
index f1448b0..6afe6f2 100644
--- a/Cryptor.h
+++ b/Cryptor.h
@@ -5,6 +5,7 @@
 #include <string>

 #include <fstream>

 #include <vector>

+#include <cstring>

 

 #ifdef WIN32

 #include <windows.h>

@@ -18,8 +19,6 @@
 #include "mbedtls/entropy.h"

 #include "mbedtls/sha256.h"

 

-#include "Socket.h"

-

 #define DEF_PASSWD_LENGTH 50

 

 #define AES_BLOCK_LENGTH 16

@@ -43,8 +42,8 @@ struct PasswordSpec {
 

 class Cryptor {

 public:

-	static void encryptAndSave(std::string remoteHost, std::string port, std::string directory, std::string payload);

-	static std::string loadAndDecrypt(std::string remoteHost, std::string port, std::string directory);

+	static void encryptAndSave(std::string directory, std::string payload);

+	static std::string loadAndDecrypt(std::string directory);

 	static std::string createRandomPassword(PasswordSpec spec);

 	static void rekey();