#5628 Make enableCrypto directly enable SSL

This commit is contained in:
Andrew Nelless 2016-09-28 11:37:33 +01:00
parent 55a2d1231f
commit 45da1dfc7c
2 changed files with 2 additions and 2 deletions

View File

@ -71,7 +71,7 @@ Client::Client(
m_sendFileThread(NULL), m_sendFileThread(NULL),
m_writeToDropDirThread(NULL), m_writeToDropDirThread(NULL),
m_socket(NULL), m_socket(NULL),
m_useSecureNetwork(false), m_useSecureNetwork(args.m_enableCrypto),
m_args(args), m_args(args),
m_enableClipboard(true) m_enableClipboard(true)
{ {

View File

@ -40,7 +40,7 @@ ClientListener::ClientListener(const NetworkAddress& address,
m_socketFactory(socketFactory), m_socketFactory(socketFactory),
m_server(NULL), m_server(NULL),
m_events(events), m_events(events),
m_useSecureNetwork(false) m_useSecureNetwork(enableCrypto)
{ {
assert(m_socketFactory != NULL); assert(m_socketFactory != NULL);