File 0001-OpenSSL-1.1.0-build-fix.patch of Package synergy

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-OpenSSL-1.1.0-build-fix.patch of Package synergy (Revision 25ec4ca6596e3ab0ef59ae90d4c96872)

Currently displaying revision 25ec4ca6596e3ab0ef59ae90d4c96872 , Show latest

commit a73b65431b755aec1f007d11feccd017cc04af6c
Author: Andrew Nelless <andrew@symless.com>
Date:   Fri May 5 01:27:25 2017 +0100

Fix showSecureCipherInfo() to build with OpenSSL 1.1.0

diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index 843c24c2..c190750b 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -805,10 +805,15 @@ SecureSocket::showSecureCipherInfo()
 		showCipherStackDesc(sStack);
 	}
 
-	// m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
-	// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	// 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;
-		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"));
 	}
 	else {

Places

File 0001-OpenSSL-1.1.0-build-fix.patch of Package synergy (Revision 25ec4ca6596e3ab0ef59ae90d4c96872)

Places