#5628 Make enableCrypto directly enable SSL

brahma-dev · Sep 28, 2016 · 45da1dfc7c54584708284f65adbac76cd10c3d0c · 45da1df
1 parent 55a2d12
commit 45da1dfc7c54584708284f65adbac76cd10c3d0c
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 src/lib/client/Client.cpp

+1 −1 src/lib/server/ClientListener.cpp
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);