From 6285b4d8b283fb38112ec04b1cc570a8c0c9844b Mon Sep 17 00:00:00 2001 From: Malfurious Date: Thu, 24 Oct 2024 08:44:36 -0400 Subject: Remove Socket class The remote socket functionality was only stub code, never fully implemented. A network architecture for compass keychains is no longer a design goal, so the dead code is removed. Signed-off-by: Malfurious --- Cryptor.cpp | 66 +++++++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 48 deletions(-) (limited to 'Cryptor.cpp') diff --git a/Cryptor.cpp b/Cryptor.cpp index 9db2bdc..1cce31e 100644 --- a/Cryptor.cpp +++ b/Cryptor.cpp @@ -61,62 +61,32 @@ void Cryptor::encryptAndSave(std::string remoteHost, std::string port, std::stri delete[] encCipher; delete[] ciphertext; - if (remoteHost == "") { - if (directory[directory.size() - 1] != '/') { - directory += "/"; - } - directory += KEYCHAIN_FILE; - std::ofstream f(directory.c_str()); - f << _encIV << std::endl; - f << _encCipher << std::endl; - f.close(); - } else { - Socket s; - std::string err = ""; - s.conn(remoteHost, port); - s.sendline("store"); - s.sendline(directory); - s.sendline(_encIV); - s.sendline(_encCipher); - err = s.readline(); - s.clo(); - if (err != "OK") { - throw 1; - } + if (directory[directory.size() - 1] != '/') { + directory += "/"; } + directory += KEYCHAIN_FILE; + std::ofstream f(directory.c_str()); + f << _encIV << std::endl; + f << _encCipher << std::endl; + f.close(); } std::string Cryptor::loadAndDecrypt(std::string remoteHost, std::string port, std::string directory) { // Load Data std::string encIV, encCipher; - if (remoteHost == "") { - if (directory[directory.size() - 1] != '/') { - directory += "/"; - } - directory += KEYCHAIN_FILE; - std::ifstream f(directory.c_str()); - if (!f.good()) { - f.close(); - throw 1; - } - f >> encIV; - f >> encCipher; + + if (directory[directory.size() - 1] != '/') { + directory += "/"; + } + directory += KEYCHAIN_FILE; + std::ifstream f(directory.c_str()); + if (!f.good()) { f.close(); - } else { - Socket s; - std::string err = ""; - s.conn(remoteHost, port); - s.sendline("fetch"); - s.sendline(directory); - err = s.readline(); - if (err != "OK") { - s.clo(); - throw 1; - } - encIV = s.readline(); - encCipher = s.readline(); - s.clo(); + throw 1; } + f >> encIV; + f >> encCipher; + f.close(); // Decode data unsigned char *ciphertext = new unsigned char[encCipher.size() / 2]; -- cgit v1.2.3