From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 20 May 2016 16:49:07 +0000 (-0600)
Subject: Check for SSL_CIPHER_get_id() support required in adjustSSL().
X-Git-Tag: SQUID_4_0_11~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b44de37908a4afdfe88d46b2f2530c05c3e8fbe5;p=thirdparty%2Fsquid.git

Check for SSL_CIPHER_get_id() support required in adjustSSL().

Our adjustSSL() hack requires SSL_CIPHER_get_id() since trunk r14670,
but that OpenSSL function is not available in some environments, leading
to compilation failures.
---

diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
index 08bc4b01c6..6f7d6ec686 100644
--- a/acinclude/lib-checks.m4
+++ b/acinclude/lib-checks.m4
@@ -297,6 +297,8 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK],[
     ssl->init_num = 0;
     ssl->s3->wpend_ret = 0;
     ssl->s3->wpend_tot = 0;
+    SSL_CIPHER *cipher = 0;
+    assert(SSL_CIPHER_get_id(cipher));
     ])
   ],
   [