summarylogtreecommitdiffstats
path: root/openssl-fix.patch
diff options
context:
space:
mode:
authorKevin MacMartin2017-06-14 16:00:09 -0400
committerKevin MacMartin2017-06-14 16:00:09 -0400
commit481d12b3523ee6cd9b54c547da493960b7993308 (patch)
tree00744a92cfae3184ff724bd529901556127849db /openssl-fix.patch
parent0108917d701f8582070ce2855c26398f611ffa25 (diff)
downloadaur-481d12b3523ee6cd9b54c547da493960b7993308.tar.gz
Fix openssl
Diffstat (limited to 'openssl-fix.patch')
-rw-r--r--openssl-fix.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/openssl-fix.patch b/openssl-fix.patch
new file mode 100644
index 00000000000..7ed7f54f644
--- /dev/null
+++ b/openssl-fix.patch
@@ -0,0 +1,23 @@
+diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
+index 7076c764e..1e35c216f 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 {