Log TLS Cryptography Parameters: more fixes to allow "make distcheck" work

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e752d37eb310db5867713c37c3a7835576979ed..f6d8860c12cca21eae666ebda914bc41899b19be 100644 (file)
--- 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 c65ed162e235c8d0cfaa2f1a6e9ccda6184ad641..34104c64f9568454226829460b9fa6fa3d5b24d0 100644 (file)
--- 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 70798f60034f9feab71c9f2f5396961c7b872092..38ef219dc03d902eaf20efa93b6facd828b281fd 100644 (file)
--- 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