From 10f0e358720116f20ce4a3b3e9f06947a3aa6fe4 Mon Sep 17 00:00:00 2001
From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 23 Dec 2015 14:08:55 +0200
Subject: [PATCH] Log TLS Cryptography Parameters: more fixes to allow "make
 distcheck" work

---
 src/Makefile.am                    |  2 +-
 src/security/NegotiationHistory.cc | 12 ++++++++++++
 src/security/NegotiationHistory.h  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e752d37eb..f6d8860c12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -566,8 +566,8 @@ squid_LDADD = \
 	ipc/libipc.la \
 	mgr/libmgr.la \
 	anyp/libanyp.la \
-	security/libsecurity.la \
 	comm/libcomm.la \
+	security/libsecurity.la \
 	eui/libeui.la \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	log/liblog.la \
diff --git a/src/security/NegotiationHistory.cc b/src/security/NegotiationHistory.cc
index c65ed162e2..34104c64f9 100644
--- a/src/security/NegotiationHistory.cc
+++ b/src/security/NegotiationHistory.cc
@@ -2,8 +2,20 @@
 #include "MemBuf.h"
 #include "security/NegotiationHistory.h"
 #include "SquidConfig.h"
+#if USE_OPENSSL
 #include "ssl/bio.h"
 #include "ssl/support.h"
+#endif
+
+Security::NegotiationHistory::NegotiationHistory():
+    helloVersion_(-1),
+    supportedVersion_(-1),
+    version_(-1)
+#if USE_OPENSSL
+    , cipher(NULL)
+#endif
+{
+}
 
 const char *
 Security::NegotiationHistory::printTlsVersion(int v) const
diff --git a/src/security/NegotiationHistory.h b/src/security/NegotiationHistory.h
index 70798f6003..38ef219dc0 100644
--- a/src/security/NegotiationHistory.h
+++ b/src/security/NegotiationHistory.h
@@ -11,7 +11,7 @@ namespace Security {
 class NegotiationHistory
 {
 public:
-    NegotiationHistory(): helloVersion_(-1), supportedVersion_(-1), version_(-1), cipher(NULL) {}
+    NegotiationHistory();
 #if USE_OPENSSL
     void fillWith(SSL *); ///< Extract negotiation information from TLS object
 #endif
-- 
2.47.3