changeset 30:662b9d3f217d

fix missing definition of "byte" from CryptoPP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 03 Oct 2020 10:39:45 +0200
parents 46621cb1bb48
children 70da4ce5c7cc
files Common/EncryptionHelpers.cpp Common/EncryptionHelpers.h
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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 <boost/lexical_cast.hpp>
 #include <iostream>
-#include "cryptopp/cryptlib.h"
-#include "cryptopp/modes.h"
-#include "cryptopp/hex.h"
-#include "cryptopp/gcm.h"
-#include "cryptopp/files.h"
+
+#include <cryptopp/cryptlib.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/hex.h>
+#include <cryptopp/gcm.h>
+#include <cryptopp/files.h>
+#include <cryptopp/filters.h>
 
 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<const char*>(block), size);
 
--- 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 <memory.h>
 #include <cryptopp/secblock.h>
-#include "cryptopp/osrng.h"
+#include <cryptopp/osrng.h>
 #include <boost/thread/mutex.hpp>
 #include <MultiThreading/Semaphore.h>
 
@@ -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);