# HG changeset patch # User Sebastien Jodogne # Date 1601714385 -7200 # Node ID 662b9d3f217d7be02312ae99d68018f7a2243edc # Parent 46621cb1bb482b40e41a1607d49edf092cc8b3d7 fix missing definition of "byte" from CryptoPP diff -r 46621cb1bb48 -r 662b9d3f217d Common/EncryptionHelpers.cpp --- a/Common/EncryptionHelpers.cpp Tue Sep 08 10:36:12 2020 +0200 +++ b/Common/EncryptionHelpers.cpp Sat Oct 03 10:39:45 2020 +0200 @@ -21,17 +21,19 @@ #include #include -#include "cryptopp/cryptlib.h" -#include "cryptopp/modes.h" -#include "cryptopp/hex.h" -#include "cryptopp/gcm.h" -#include "cryptopp/files.h" + +#include +#include +#include +#include +#include +#include const std::string EncryptionHelpers::HEADER_VERSION = "A1"; using namespace CryptoPP; -std::string EncryptionHelpers::ToHexString(const byte* block, size_t size) +std::string EncryptionHelpers::ToHexString(const void* block, size_t size) { std::string blockAsString = std::string(reinterpret_cast(block), size); diff -r 46621cb1bb48 -r 662b9d3f217d Common/EncryptionHelpers.h --- a/Common/EncryptionHelpers.h Tue Sep 08 10:36:12 2020 +0200 +++ b/Common/EncryptionHelpers.h Sat Oct 03 10:39:45 2020 +0200 @@ -19,7 +19,7 @@ #include #include -#include "cryptopp/osrng.h" +#include #include #include @@ -100,7 +100,7 @@ public: - static std::string ToHexString(const byte* block, size_t size); + static std::string ToHexString(const void* block, size_t size); static std::string ToHexString(const std::string& block); static std::string ToHexString(const CryptoPP::SecByteBlock& block); static std::string ToString(const CryptoPP::SecByteBlock& block);