Prefer repository-cryptopp to system installed one

src/blockstore/implementations/compressing/compressors/Gzip.cpp

@@ -1,6 +1,6 @@
 #include "cpp-utils/crypto/cryptopp_byte.h"
 #include "Gzip.h"
-#include <cryptopp/gzip.h>
+#include <vendor_cryptopp/gzip.h>
 
 using cpputils::Data;
 

src/cpp-utils/crypto/cryptopp_byte.h

@@ -2,7 +2,7 @@
 #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
 #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
 
-#include <cryptopp/cryptlib.h>
+#include <vendor_cryptopp/cryptlib.h>
 
 // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
 // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).

src/cpp-utils/crypto/hash/Hash.cpp

@@ -1,6 +1,6 @@
 #include "Hash.h"
 #include <cpp-utils/random/Random.h>
-#include <cryptopp/sha.h>
+#include <vendor_cryptopp/sha.h>
 
 using cpputils::Random;
 using CryptoPP::SHA512;

src/cpp-utils/crypto/kdf/Scrypt.cpp

@@ -1,5 +1,5 @@
 #include "Scrypt.h"
-#include <cryptopp/scrypt.h>
+#include <vendor_cryptopp/scrypt.h>
 
 using std::string;
 

src/cpp-utils/crypto/symmetric/CFB_Cipher.h

@@ -7,7 +7,7 @@
 #include "../../data/Data.h"
 #include "../../random/Random.h"
 #include <boost/optional.hpp>
-#include <cryptopp/modes.h>
+#include <vendor_cryptopp/modes.h>
 #include "Cipher.h"
 #include "EncryptionKey.h"
 

src/cpp-utils/crypto/symmetric/GCM_Cipher.h

@@ -6,7 +6,7 @@
 #include "../../data/FixedSizeData.h"
 #include "../../data/Data.h"
 #include "../../random/Random.h"
-#include <cryptopp/gcm.h>
+#include <vendor_cryptopp/gcm.h>
 #include "Cipher.h"
 #include "EncryptionKey.h"
 

src/cpp-utils/crypto/symmetric/ciphers.h

@@ -2,11 +2,11 @@
 #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
 #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
 
-#include <cryptopp/aes.h>
+#include <vendor_cryptopp/aes.h>
-#include <cryptopp/twofish.h>
+#include <vendor_cryptopp/twofish.h>
-#include <cryptopp/serpent.h>
+#include <vendor_cryptopp/serpent.h>
-#include <cryptopp/cast.h>
+#include <vendor_cryptopp/cast.h>
-#include <cryptopp/mars.h>
+#include <vendor_cryptopp/mars.h>
 #include "GCM_Cipher.h"
 #include "CFB_Cipher.h"
 

src/cpp-utils/data/Data.cpp

@@ -1,6 +1,6 @@
 #include "Data.h"
 #include <stdexcept>
-#include <cryptopp/hex.h>
+#include <vendor_cryptopp/hex.h>
 #include <cpp-utils/crypto/cryptopp_byte.h>
 
 using std::istream;

src/cpp-utils/data/FixedSizeData.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
 #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
 
-#include <cryptopp/hex.h>
+#include <vendor_cryptopp/hex.h>
 #include <string>
 #include <cstring>
 #include "../assert/assert.h"

src/cpp-utils/random/OSRandomGenerator.h

@@ -4,7 +4,7 @@
 
 #include "cpp-utils/crypto/cryptopp_byte.h"
 #include "RandomGenerator.h"
-#include <cryptopp/osrng.h>
+#include <vendor_cryptopp/osrng.h>
 
 namespace cpputils {
     class OSRandomGenerator final : public RandomGenerator {

src/cpp-utils/random/RandomGeneratorThread.h

@@ -4,7 +4,7 @@
 
 #include "../thread/LoopThread.h"
 #include "ThreadsafeRandomDataBuffer.h"
-#include <cryptopp/osrng.h>
+#include <vendor_cryptopp/osrng.h>
 
 namespace cpputils {
     //TODO Test

src/cryfs/localstate/BasedirMetadata.cpp

@@ -1,7 +1,7 @@
 #include "BasedirMetadata.h"
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
-#include <cryptopp/sha.h>
+#include <vendor_cryptopp/sha.h>
 #include <boost/filesystem/operations.hpp>
 #include "LocalStateDir.h"
 

test/cryfs/config/CompatibilityTest.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <boost/filesystem.hpp>
 #include <cpp-utils/data/Data.h>
-#include <cryptopp/hex.h>
+#include <vendor_cryptopp/hex.h>
 #include <cpp-utils/crypto/symmetric/ciphers.h>
 #include <cpp-utils/tempfile/TempFile.h>
 #include <cryfs/config/CryConfigFile.h>

vendor/cryptopp/CMakeLists.txt

@@ -1,6 +1,7 @@
 project(mycryptopp)
 
 add_library(cryptopp dummy.cpp)
+# note: include directory is called vendor_cryptopp instead of cryptopp to avoid include clashes with system headers
 target_include_directories(cryptopp SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(OpenMP)
@@ -17,7 +18,7 @@ set(BUILD_TESTING OFF)
 set(BUILD_DOCUMENTATION OFF)
 set(BUILD_SHARED OFF)
 set(BUILD_STATIC ON)
-add_subdirectory(cryptopp EXCLUDE_FROM_ALL)
+add_subdirectory(vendor_cryptopp EXCLUDE_FROM_ALL)
 
 target_link_libraries(cryptopp PRIVATE cryptopp-static)