From c0e3a492342976c312b1e5734017ed927ed52e8b Mon Sep 17 00:00:00 2001 From: momo5502 Date: Wed, 17 Aug 2016 03:19:17 +0200 Subject: [PATCH] TDES -> DES3 --- deps/mongoose | 2 +- deps/protobuf | 2 +- src/Utils/Cryptography.cpp | 10 +++++----- src/Utils/Cryptography.hpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps/mongoose b/deps/mongoose index ff159bf3..af6fc64a 160000 --- a/deps/mongoose +++ b/deps/mongoose @@ -1 +1 @@ -Subproject commit ff159bf30ac1a213c3dd0b0714c7cd07db616ad2 +Subproject commit af6fc64ab9bec64e91b2bebc16f71d07d5d2e208 diff --git a/deps/protobuf b/deps/protobuf index e3891655..549dde19 160000 --- a/deps/protobuf +++ b/deps/protobuf @@ -1 +1 @@ -Subproject commit e3891655868a465ad0d17ddc2b1ea95dd0a39adf +Subproject commit 549dde19282767af6ba875ace06644ab5cfd14e2 diff --git a/src/Utils/Cryptography.cpp b/src/Utils/Cryptography.cpp index 91435c25..da24ca3c 100644 --- a/src/Utils/Cryptography.cpp +++ b/src/Utils/Cryptography.cpp @@ -8,7 +8,7 @@ namespace Utils { void Initialize() { - TDES::Initialize(); + DES3::Initialize(); Rand::Initialize(); } @@ -122,14 +122,14 @@ namespace Utils #pragma endregion -#pragma region TDES +#pragma region DES3 - void TDES::Initialize() + void DES3::Initialize() { register_cipher(&des3_desc); } - std::string TDES::Encrypt(std::string text, std::string iv, std::string key) + std::string DES3::Encrypt(std::string text, std::string iv, std::string key) { std::string encData; encData.resize(text.size()); @@ -144,7 +144,7 @@ namespace Utils return encData; } - std::string TDES::Decrpyt(std::string data, std::string iv, std::string key) + std::string DES3::Decrpyt(std::string data, std::string iv, std::string key) { std::string decData; decData.resize(data.size()); diff --git a/src/Utils/Cryptography.hpp b/src/Utils/Cryptography.hpp index 66d58fe6..236532f1 100644 --- a/src/Utils/Cryptography.hpp +++ b/src/Utils/Cryptography.hpp @@ -285,7 +285,7 @@ namespace Utils static bool VerifyMessage(Key key, std::string message, std::string signature); }; - class TDES + class DES3 { public: static void Initialize();