Mercurial > hg > orthanc-object-storage

comparison Common/EncryptionHelpers.cpp @ 30:662b9d3f217d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix missing definition of "byte" from CryptoPP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 03 Oct 2020 10:39:45 +0200
parents b0b7eb7cff73
children f55b2afdf53d
comparison
equal deleted inserted replaced
29:46621cb1bb48 30:662b9d3f217d
19 #include "EncryptionHelpers.h" 19 #include "EncryptionHelpers.h"
20 #include <assert.h> 20 #include <assert.h>
21 21
22 #include <boost/lexical_cast.hpp> 22 #include <boost/lexical_cast.hpp>
23 #include <iostream> 23 #include <iostream>
24 #include "cryptopp/cryptlib.h" 24
25 #include "cryptopp/modes.h" 25 #include <cryptopp/cryptlib.h>
26 #include "cryptopp/hex.h" 26 #include <cryptopp/modes.h>
27 #include "cryptopp/gcm.h" 27 #include <cryptopp/hex.h>
28 #include "cryptopp/files.h" 28 #include <cryptopp/gcm.h>
29 #include <cryptopp/files.h>
30 #include <cryptopp/filters.h>
29 31
30 const std::string EncryptionHelpers::HEADER_VERSION = "A1"; 32 const std::string EncryptionHelpers::HEADER_VERSION = "A1";
31 33
32 using namespace CryptoPP; 34 using namespace CryptoPP;
33 35
34 std::string EncryptionHelpers::ToHexString(const byte* block, size_t size) 36 std::string EncryptionHelpers::ToHexString(const void* block, size_t size)
35 { 37 {
36 std::string blockAsString = std::string(reinterpret_cast<const char*>(block), size); 38 std::string blockAsString = std::string(reinterpret_cast<const char*>(block), size);
37 39
38 return ToHexString(blockAsString); 40 return ToHexString(blockAsString);
39 } 41 }