rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'adam-sandbox'

This commit is contained in:
Adam Potolsky 2015-06-12 16:03:34 -07:00
parent efab42962f afb0e2a2ea
commit 768445816b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/plugin/ns/SecureSocket.cpp
View File

@ -306,7 +306,9 @@ SecureSocket::secureAccept(int socket)
if (retry == 0) { if (retry == 0) {
m_secureReady = true; m_secureReady = true;
LOG((CLOG_INFO "accepted secure socket")); LOG((CLOG_INFO "accepted secure socket"));
showSecureCipherInfo(); if (CLOG->getFilter() >= kDEBUG1) {
showSecureCipherInfo();
}
showSecureConnectInfo(); showSecureConnectInfo();
return 1; return 1;
} }
@ -365,7 +367,9 @@ SecureSocket::secureConnect(int socket)
return -1; // Fingerprint failed, error return -1; // Fingerprint failed, error
} }
LOG((CLOG_DEBUG2 "connected secure socket")); LOG((CLOG_DEBUG2 "connected secure socket"));
showSecureCipherInfo(); if (CLOG->getFilter() >= kDEBUG1) {
showSecureCipherInfo();
}
showSecureConnectInfo(); showSecureConnectInfo();
return 1; return 1;
} }
@ -640,12 +644,12 @@ void
SecureSocket::showSecureCipherInfo() SecureSocket::showSecureCipherInfo()
{ {
STACK_OF(SSL_CIPHER) * sStack = SSL_get_ciphers(m_ssl->m_ssl); STACK_OF(SSL_CIPHER) * sStack = SSL_get_ciphers(m_ssl->m_ssl);
int i = 0;
if (sStack == NULL) { if (sStack == NULL) {
LOG((CLOG_WARN "No ciphers available on server")); LOG((CLOG_DEBUG1 "local cipher list not available"));
} }
else { else {
LOG((CLOG_DEBUG1 "Ciphers available on server:")); LOG((CLOG_DEBUG1 "available local ciphers:"));
showCipherStackDesc(sStack); showCipherStackDesc(sStack);
} }
@ -653,10 +657,10 @@ SecureSocket::showSecureCipherInfo()
// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
if (cStack == NULL) { if (cStack == NULL) {
LOG((CLOG_WARN "No ciphers available from client")); LOG((CLOG_DEBUG1 "remote cipher list not available"));
} }
else { else {
LOG((CLOG_DEBUG1 "Ciphers available on client:")); LOG((CLOG_DEBUG1 "available remote ciphers:"));
showCipherStackDesc(cStack); showCipherStackDesc(cStack);
} }
return; return;
@ -666,10 +670,10 @@ void
SecureSocket::showSecureLibInfo() SecureSocket::showSecureLibInfo()
{ {
LOG((CLOG_INFO "%s",SSLeay_version(SSLEAY_VERSION))); LOG((CLOG_INFO "%s",SSLeay_version(SSLEAY_VERSION)));
LOG((CLOG_DEBUG2 "OpenSSL : %s",SSLeay_version(SSLEAY_CFLAGS))); LOG((CLOG_DEBUG1 "openSSL : %s",SSLeay_version(SSLEAY_CFLAGS)));
LOG((CLOG_DEBUG2 "OpenSSL : %s",SSLeay_version(SSLEAY_BUILT_ON))); LOG((CLOG_DEBUG1 "openSSL : %s",SSLeay_version(SSLEAY_BUILT_ON)));
LOG((CLOG_DEBUG2 "OpenSSL : %s",SSLeay_version(SSLEAY_PLATFORM))); LOG((CLOG_DEBUG1 "openSSL : %s",SSLeay_version(SSLEAY_PLATFORM)));
LOG((CLOG_DEBUG2 "%s",SSLeay_version(SSLEAY_DIR))); LOG((CLOG_DEBUG1 "%s",SSLeay_version(SSLEAY_DIR)));
return; return;
} }