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

Fix showSecureCipherInfo() to build with OpenSSL 1.1.0

This commit is contained in:
Andrew Nelless 2017-05-05 01:27:25 +01:00
parent 0888b1228c
commit a73b65431b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/net/SecureSocket.cpp
View File

@ -805,10 +805,15 @@ SecureSocket::showSecureCipherInfo()
showCipherStackDesc(sStack); showCipherStackDesc(sStack);
} }
// m_ssl->m_ssl->session->ciphers is not forward compatable, In future release #if OPENSSL_VERSION_NUMBER < 0x10100000L
// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead // m_ssl->m_ssl->session->ciphers is not forward compatable,
// In future release of OpenSSL, it's not visible,
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) { #else
// Use SSL_get_client_ciphers() for newer versions
STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
#endif
if (cStack == NULL) {
LOG((CLOG_DEBUG1 "remote cipher list not available")); LOG((CLOG_DEBUG1 "remote cipher list not available"));
} }
else { else {