Remove last remnants of TLS

.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
+CMakeCache.txt
-CMakeLists.txt.user
+CMakeLists.txt.user

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.
 #

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
 

dist/wix/Include.wxi.in

@@ -2,7 +2,7 @@
 <Include>
     <?define Name="Synergy" ?>
     <?define Version="@SYNERGY_VERSION@" ?>
-    <?define QtVersion="5.9.1" ?> <!-- TODO: Configure this externally //--> 
+    <?define QtVersion="5.9.3" ?> <!-- TODO: Configure this externally //--> 
     <?define Author="Symless" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
     <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
@@ -20,8 +20,6 @@
     <?endif ?>
     <?define QtBinPath="$(var.QtPath)\bin" ?>
     <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
-    <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
-    <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
     <?if $(var.Configuration) = "Debug" ?>
         <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
     <?endif ?>

dist/wix/Product.wxs

@@ -12,7 +12,6 @@
 		</Upgrade>
 		<Feature Id="ProductFeature" Title="$(var.Name)">
 			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSSLComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<MergeRef Id="CRT"/>
             <?if $(var.Configuration) = "Debug" ?>
@@ -56,7 +55,6 @@
 					<?if $(var.Configuration) = "Debug" ?>
 					    <Merge DiskId="1" Id="DebugCRT" Language="0" SourceFile="$(var.DebugCRT)"/>
 				    <?endif ?>
-					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
 				</Directory>
 			</Directory>
@@ -77,8 +75,6 @@
 				<File Source="$(var.BinPath)/synergyc.exe"/>
 				<File Source="$(var.BinPath)/syntool.exe"/>
 				<File Source="$(var.BinPath)/synwinhk.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
 				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
@@ -115,13 +111,5 @@
 				<?endif ?>
 			</Component>
 		</ComponentGroup>
-		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
-				<File Id="OpenSSLDll1" Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
-				<File Id="OpenSSLDll2" Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
-				<File Source="$(var.ResPath)/openssl/synergy.conf"/>
-			</Component>
-		</ComponentGroup>
 	</Fragment>
 </Wix>

res/openssl/synergy.conf

@@ -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

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")

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})

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})

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()

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})

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})