3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-22 02:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Jerry's patch for password hash and custom mode (via command line).

Browse source
This commit is contained in:
Nick Bolton 2013-04-09 21:57:07 +00:00
parent 7010de9cc4
commit 880819fab7
20 changed files with 557 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/client/CClient.cpp
View file

@ -35,10 +35,6 @@
#include "CArch.h"
#include "IPlatformScreen.h"
#include "CCryptoStream.h"
// TODO: these are just for testing -- make sure they're gone by release!
const byte g_key[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
const byte g_iv[] = "aaaaaaaaaaaaaaa";
//
// CClient
@ -52,7 +48,8 @@ CClient::CClient(IEventQueue* eventQueue,
const CString& name, const CNetworkAddress& address,
ISocketFactory* socketFactory,
IStreamFilterFactory* streamFilterFactory,
CScreen* screen) :
CScreen* screen,
const CCryptoOptions& crypto) :
m_mock(false),
m_name(name),
m_serverAddress(address),
@ -67,7 +64,8 @@ CClient::CClient(IEventQueue* eventQueue,
m_suspended(false),
m_connectOnResume(false),
m_eventQueue(eventQueue),
m_cryptoStream(NULL)
m_cryptoStream(NULL),
m_crypto(crypto)
{
assert(m_socketFactory != NULL);
assert(m_screen != NULL);
@ -148,9 +146,9 @@ CClient::connect()
}
m_stream = new CPacketStreamFilter(m_stream, true);
if (s_cryptoEnabled) {
m_cryptoStream = new CCryptoStream(m_eventQueue, m_stream, true);
m_cryptoStream->setKeyWithIv(g_key, sizeof(g_key), g_iv);
if (m_crypto.m_mode != kDisabled) {
m_cryptoStream = new CCryptoStream(
EVENTQUEUE, m_stream, m_crypto, true);
m_stream = m_cryptoStream;
}