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
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,6 +133,10 @@
check_type_size(long SIZEOF_LONG)
check_type_size(short SIZEOF_SHORT)
+ set(CMAKE_REQUIRED_LIBRARIES crypto++)
+ set(CMAKE_REQUIRED_LIBRARIES)
+ set(CMAKE_INCLUDE_DIRECTORIES)
+
# pthread is used on both Linux and Mac
check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
if (HAVE_PTHREAD)
diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt
--- synergy-1.4.17-Source/ext/CMakeLists.txt 2014-03-20 20:24:24.000000000 +0100
+++ lol/ext/CMakeLists.txt 2014-03-27 01:53:09.017682192 +0100
@@ -13,46 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-set(cryptopp_dir cryptopp562)
-
-# only compile the crypto++ files we need.
-set(cryptopp_src
- ${cryptopp_dir}/3way.cpp
- ${cryptopp_dir}/algparam.cpp
- ${cryptopp_dir}/asn.cpp
- ${cryptopp_dir}/authenc.cpp
- ${cryptopp_dir}/basecode.cpp
- ${cryptopp_dir}/cpu.cpp
- ${cryptopp_dir}/cryptlib.cpp
- ${cryptopp_dir}/des.cpp
- ${cryptopp_dir}/dessp.cpp
- ${cryptopp_dir}/dll.cpp
- ${cryptopp_dir}/ec2n.cpp
- ${cryptopp_dir}/ecp.cpp
- ${cryptopp_dir}/filters.cpp
- ${cryptopp_dir}/fips140.cpp
- ${cryptopp_dir}/gcm.cpp
- ${cryptopp_dir}/gf2n.cpp
- ${cryptopp_dir}/gfpcrypt.cpp
- ${cryptopp_dir}/hex.cpp
- ${cryptopp_dir}/hmac.cpp
- ${cryptopp_dir}/hrtimer.cpp
- ${cryptopp_dir}/integer.cpp
- ${cryptopp_dir}/iterhash.cpp
- ${cryptopp_dir}/misc.cpp
- ${cryptopp_dir}/modes.cpp
- ${cryptopp_dir}/mqueue.cpp
- ${cryptopp_dir}/nbtheory.cpp
- ${cryptopp_dir}/oaep.cpp
- ${cryptopp_dir}/osrng.cpp
- ${cryptopp_dir}/pubkey.cpp
- ${cryptopp_dir}/queue.cpp
- ${cryptopp_dir}/randpool.cpp
- ${cryptopp_dir}/rdtables.cpp
- ${cryptopp_dir}/rijndael.cpp
- ${cryptopp_dir}/rng.cpp
- ${cryptopp_dir}/sha.cpp
-)
# if 64-bit windows, compile asm file.
if (CMAKE_CL_64)
@@ -87,10 +47,3 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
endif()
endif()
-
-add_library(cryptopp STATIC ${cryptopp_src})
-
-if (UNIX)
- # ignore warnings in crypto++
- set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
-endif()
diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt
--- synergy-1.4.17-Source/src/CMakeLists.txt 2014-02-26 18:46:02.000000000 +0100
+++ lol/src/CMakeLists.txt 2014-03-27 01:54:56.390157358 +0100
@@ -18,7 +18,3 @@
add_subdirectory(cmd)
add_subdirectory(plugin)
add_subdirectory(micro)
-
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
- add_subdirectory(test)
-endif()
diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h
--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
+++ lol/src/lib/io/CryptoMode_cryptopp.h 2014-03-27 01:45:34.810484242 +0100
@@ -25,6 +25,6 @@
# pragma GCC system_header
#endif
-#include <cryptopp562/gcm.h>
-#include <cryptopp562/modes.h>
-#include <cryptopp562/aes.h>
+#include <cryptopp/gcm.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/aes.h>
diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h
--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
+++ lol/src/lib/io/CryptoStream_cryptopp.h 2014-03-27 01:45:45.727405235 +0100
@@ -25,5 +25,5 @@
# pragma GCC system_header
#endif
-#include <cryptopp562/osrng.h>
-#include <cryptopp562/sha.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/sha.h>
|
