#5628 Make enableCrypto directly enable SSL

symless · Sep 29, 2016 · 76e495d · 76e495d
1 parent 6bd0f47
commit 76e495d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
@@ -71,7 +71,7 @@ Client::Client(
 	m_sendFileThread(NULL),
 	m_writeToDropDirThread(NULL),
 	m_socket(NULL),
-	m_useSecureNetwork(false),
+	m_useSecureNetwork(args.m_enableCrypto),
 	m_args(args),
 	m_enableClipboard(true)
 {

diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
@@ -40,7 +40,7 @@ ClientListener::ClientListener(const NetworkAddress& address,
 	m_socketFactory(socketFactory),
 	m_server(NULL),
 	m_events(events),
-	m_useSecureNetwork(false)
+	m_useSecureNetwork(enableCrypto)
 {
 	assert(m_socketFactory != NULL);