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

Passed args into client and socket

Browse source 
Conflicts:
	src/lib/client/Client.cpp
	src/lib/client/Client.h
	src/lib/synergy/ClientApp.cpp
	src/test/integtests/net/NetworkTests.cpp
This commit is contained in:
XinyuHou 2015-04-02 14:43:23 +01:00
parent 39e183da3e
commit b4665b9cd5
10 changed files with 41 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/plugin/ns/SecureSocket.cpp
View file

@ -46,7 +46,7 @@ CSecureSocket::CSecureSocket(
CSocketMultiplexer* socketMultiplexer) :
CTCPSocket(events, socketMultiplexer),
m_secureReady(false),
m_certFingerprint()
m_certFingerprintFilename()
{
}
@ -405,6 +405,10 @@ CSecureSocket::disconnect()
bool
CSecureSocket::verifyCertFingerprint()
{
if (m_certFingerprintFilename.empty()) {
return false;
}
// calculate received certificate fingerprint
X509 *cert = cert = SSL_get_peer_certificate(m_ssl->m_ssl);
EVP_MD* tempDigest;
@ -426,7 +430,7 @@ CSecureSocket::verifyCertFingerprint()
CString fileLine;
CString certificateFingerprint;
std::ifstream file;
file.open(m_certFingerprint.c_str());
file.open(m_certFingerprintFilename.c_str());
while (!file.eof()) {
getline(file,fileLine);