From e21c41ba9963f4d134366634a7f5ed73f519c30e Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Sun, 26 Nov 2017 21:44:26 +0000 Subject: [PATCH] Remove last remnants of TLS --- .gitignore | 5 +-- CMakeLists.txt | 30 -------------- LICENSE | 3 -- dist/wix/Include.wxi.in | 4 +- dist/wix/Product.wxs | 12 ------ res/openssl/synergy.conf | 65 ------------------------------ src/cmd/core/CMakeLists.txt | 2 +- src/cmd/synergyc/CMakeLists.txt | 2 +- src/cmd/synergys/CMakeLists.txt | 2 +- src/lib/net/CMakeLists.txt | 2 +- src/test/integtests/CMakeLists.txt | 2 +- src/test/unittests/CMakeLists.txt | 2 +- 12 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 res/openssl/synergy.conf diff --git a/.gitignore b/.gitignore index eef81a8f..9bd8c19d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ config.h /build /CMakeFiles /ext/cryptopp562 -/ext/openssl /src/gui/Makefile* /src/gui/object_script* /src/gui/tmp @@ -19,5 +18,5 @@ src/gui/gui.pro.user* src/gui/.qmake.stash src/gui/.rnd src/setup/win32/synergy.suo -CMakeCache.txt -CMakeLists.txt.user +CMakeCache.txt +CMakeLists.txt.user diff --git a/CMakeLists.txt b/CMakeLists.txt index ecdbd11a..4d743f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,36 +288,6 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") ) endif() -# -# OpenSSL -# -if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set (OPENSSL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/windows) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - set (OPENSSL_ROOT "${OPENSSL_ROOT}/x64") - else() - set (OPENSSL_ROOT "${OPENSSL_ROOT}/x86") - endif() - - include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) - set (OPENSSL_LIBS - ${OPENSSL_ROOT}/lib/libeay32.lib - ${OPENSSL_ROOT}/lib/ssleay32.lib - ) -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set (OPENSSL_ROOT /usr/local/opt/openssl) - - include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) - set (OPENSSL_LIBS - ${OPENSSL_ROOT}/lib/libssl.a - ${OPENSSL_ROOT}/lib/libcrypto.a - ) -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set (OPENSSL_LIBS ssl crypto) -else() - message (FATAL_ERROR "Couldn't find OpenSSL") -endif() - # # Configure_file... but for directories, recursively. # diff --git a/LICENSE b/LICENSE index a96e4816..fb1e4f3e 100644 --- a/LICENSE +++ b/LICENSE @@ -2,9 +2,6 @@ Copyright (C) 2012-2016 Symless Ltd. Copyright (C) 2008-2014 Nick Bolton Copyright (C) 2002-2014 Chris Schoeneman -This program is released under the GPL with the additional exemption -that compiling, linking, and/or using OpenSSL is allowed. - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in index cf6d68e7..bd3adfe3 100644 --- a/dist/wix/Include.wxi.in +++ b/dist/wix/Include.wxi.in @@ -2,7 +2,7 @@ - + @@ -20,8 +20,6 @@ - - diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs index 02f23315..92850325 100644 --- a/dist/wix/Product.wxs +++ b/dist/wix/Product.wxs @@ -12,7 +12,6 @@ - @@ -56,7 +55,6 @@ - @@ -77,8 +75,6 @@ - - @@ -115,13 +111,5 @@ - - - - - - - - \ No newline at end of file diff --git a/res/openssl/synergy.conf b/res/openssl/synergy.conf deleted file mode 100644 index c7a3e439..00000000 --- a/res/openssl/synergy.conf +++ /dev/null @@ -1,65 +0,0 @@ -# -# Synergy OpenSSL configuration file. -# Used for generation of certificate requests. -# - -dir = . - -[ca] -default_ca = CA_default - -[CA_default] -serial = $dir/serial -database = $dir/certindex.txt -new_certs_dir = $dir/certs -certificate = $dir/cacert.pem -private_key = $dir/private/cakey.pem -default_days = 365 -default_md = md5 -preserve = no -email_in_dn = no -nameopt = default_ca -certopt = default_ca -policy = policy_match - -[policy_match] -countryName = match -stateOrProvinceName = match -organizationName = match -organizationalUnitName = optional -commonName = supplied -emailAddress = optional - -[req] -default_bits = 1024 # Size of keys -default_keyfile = key.pem # name of generated keys -default_md = md5 # message digest algorithm -string_mask = nombstr # permitted characters -distinguished_name = req_distinguished_name -req_extensions = v3_req - -[req_distinguished_name] -0.organizationName = Organization Name (company) -organizationalUnitName = Organizational Unit Name (department, division) -emailAddress = Email Address -emailAddress_max = 40 -localityName = Locality Name (city, district) -stateOrProvinceName = State or Province Name (full name) -countryName = Country Name (2 letter code) -countryName_min = 2 -countryName_max = 2 -commonName = Common Name (hostname, IP, or your name) -commonName_max = 64 -0.organizationName_default = My Company -localityName_default = My Town -stateOrProvinceName_default = State or Providence -countryName_default = US - -[v3_ca] -basicConstraints = CA:TRUE -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid:always,issuer:always - -[v3_req] -basicConstraints = CA:FALSE -subjectKeyIdentifier = hash diff --git a/src/cmd/core/CMakeLists.txt b/src/cmd/core/CMakeLists.txt index c485983e..b9aaa789 100644 --- a/src/cmd/core/CMakeLists.txt +++ b/src/cmd/core/CMakeLists.txt @@ -15,7 +15,7 @@ add_executable(synergy-core main.cpp) target_link_libraries(synergy-core - arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS}) + arch base client common io mt net ipc platform server core ${libs}) if (SYNERGY_CORE_INSTALL) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt index be6edc52..9cc6ab67 100644 --- a/src/cmd/synergyc/CMakeLists.txt +++ b/src/cmd/synergyc/CMakeLists.txt @@ -39,4 +39,4 @@ endif() add_executable(synergyc ${sources}) target_link_libraries(synergyc - arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS}) + arch base client common io mt net ipc platform server core ${libs}) diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt index c6e995d4..e03f35da 100644 --- a/src/cmd/synergys/CMakeLists.txt +++ b/src/cmd/synergys/CMakeLists.txt @@ -36,4 +36,4 @@ endif() add_executable(synergys ${sources}) target_link_libraries(synergys - arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS}) + arch base client common io mt net ipc platform server core ${libs}) diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt index 62e0231a..5a222641 100644 --- a/src/lib/net/CMakeLists.txt +++ b/src/lib/net/CMakeLists.txt @@ -24,5 +24,5 @@ endif() add_library(net STATIC ${sources}) if (UNIX) - target_link_libraries(net mt io ${OPENSSL_LIBS}) + target_link_libraries(net mt io) endif() diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index 825b1ef6..87bb17ea 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(integtests ${sources}) target_link_libraries(integtests - arch base client common io ipc mt net platform server core gtest gmock ${libs} ${OPENSSL_LIBS}) + arch base client common io ipc mt net platform server core gtest gmock ${libs}) diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt index 9e9b5dfe..75d57813 100644 --- a/src/test/unittests/CMakeLists.txt +++ b/src/test/unittests/CMakeLists.txt @@ -68,4 +68,4 @@ endif() add_executable(unittests ${sources}) target_link_libraries(unittests - arch base client server common io net platform server core mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) + arch base client server common io net platform server core mt ipc gtest gmock shared ${libs})