1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
Description: Use the system libcrypto++
Bug-Debian: https://bugs.debian.org/1108008
--- cryfs-0.11.4.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
+++ cryfs-0.11.4/src/blockstore/implementations/compressing/compressors/Gzip.cpp
@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <crypto++/gzip.h>
using cpputils::Data;
--- cryfs-0.11.4.orig/src/cpp-utils/crypto/hash/Hash.cpp
+++ cryfs-0.11.4/src/cpp-utils/crypto/hash/Hash.cpp
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
-#include <vendor_cryptopp/sha.h>
+#include <crypto++/sha.h>
using cpputils::Random;
using CryptoPP::SHA512;
--- cryfs-0.11.4.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
+++ cryfs-0.11.4/src/cpp-utils/crypto/kdf/Scrypt.cpp
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
+#include <crypto++/scrypt.h>
using std::string;
--- cryfs-0.11.4.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
+++ cryfs-0.11.4/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
-#include <vendor_cryptopp/modes.h>
+#include <crypto++/modes.h>
#include "Cipher.h"
#include "EncryptionKey.h"
--- cryfs-0.11.4.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
+++ cryfs-0.11.4/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
@@ -3,7 +3,7 @@
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
#include "AEAD_Cipher.h"
-#include <vendor_cryptopp/gcm.h>
+#include <crypto++/gcm.h>
namespace cpputils {
--- cryfs-0.11.4.orig/src/cpp-utils/crypto/symmetric/ciphers.h
+++ cryfs-0.11.4/src/cpp-utils/crypto/symmetric/ciphers.h
@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
-#include <vendor_cryptopp/aes.h>
-#include <vendor_cryptopp/twofish.h>
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
-#include <vendor_cryptopp/chachapoly.h>
+#include <crypto++/aes.h>
+#include <crypto++/twofish.h>
+#include <crypto++/serpent.h>
+#include <crypto++/cast.h>
+#include <crypto++/mars.h>
+#include <crypto++/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
--- cryfs-0.11.4.orig/src/cpp-utils/data/Data.cpp
+++ cryfs-0.11.4/src/cpp-utils/data/Data.cpp
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <crypto++/hex.h>
using std::istream;
using std::ofstream;
--- cryfs-0.11.4.orig/src/cpp-utils/data/FixedSizeData.h
+++ cryfs-0.11.4/src/cpp-utils/data/FixedSizeData.h
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
-#include <vendor_cryptopp/hex.h>
+#include <crypto++/hex.h>
#include <string>
#include <array>
#include <cstring>
--- cryfs-0.11.4.orig/src/cpp-utils/random/OSRandomGenerator.h
+++ cryfs-0.11.4/src/cpp-utils/random/OSRandomGenerator.h
@@ -3,7 +3,7 @@
#define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <crypto++/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
--- cryfs-0.11.4.orig/src/cpp-utils/random/RandomGeneratorThread.h
+++ cryfs-0.11.4/src/cpp-utils/random/RandomGeneratorThread.h
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
#include "ThreadsafeRandomDataBuffer.h"
-#include <vendor_cryptopp/osrng.h>
+#include <crypto++/osrng.h>
namespace cpputils {
//TODO Test
--- cryfs-0.11.4.orig/src/cryfs/impl/localstate/BasedirMetadata.cpp
+++ cryfs-0.11.4/src/cryfs/impl/localstate/BasedirMetadata.cpp
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
-#include <vendor_cryptopp/sha.h>
+#include <crypto++/sha.h>
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
--- cryfs-0.11.4.orig/test/cryfs/impl/config/CompatibilityTest.cpp
+++ cryfs-0.11.4/test/cryfs/impl/config/CompatibilityTest.cpp
@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
-#include <vendor_cryptopp/hex.h>
+#include <crypto++/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
#include <cryfs/impl/config/CryConfigFile.h>
--- cryfs-0.11.4.orig/vendor/CMakeLists.txt
+++ cryfs-0.11.4/vendor/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory(googletest)
-add_subdirectory(cryptopp)
+#add_subdirectory(cryptopp)
|
