smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6435 from vifino/patch-1

Browse source 
Fixed missing SSL_get_client_ciphers with LibreSSL
This commit is contained in:
Jnewbon 2020-01-21 16:19:40 +00:00 committed by GitHub
commit e047cd66fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/net/SecureSocket.cpp
View file

@ -814,12 +814,13 @@ SecureSocket::showSecureCipherInfo()
showCipherStackDesc(sStack); showCipherStackDesc(sStack);
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
// m_ssl->m_ssl->session->ciphers is not forward compatable, // m_ssl->m_ssl->session->ciphers is not forward compatable,
// In future release of OpenSSL, it's not visible, // In future release of OpenSSL, it's not visible,
// however, LibreSSL still uses this.
STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
#else #else
// Use SSL_get_client_ciphers() for newer versions // Use SSL_get_client_ciphers() for newer versions of OpenSSL.
STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
#endif #endif
if (cStack == NULL) { if (cStack == NULL) {