From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 22 Apr 2016 16:47:59 +0000 (-0600)
Subject: Fixed "make check".
X-Git-Tag: SQUID_4_0_11~29^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=015cf86c4bf37f7a55b5c658e0b5d40881067c73;p=thirdparty%2Fsquid.git

Fixed "make check".
---

diff --git a/src/security/Handshake.cc b/src/security/Handshake.cc
index 17fc2ace65..fa3cda2067 100644
--- a/src/security/Handshake.cc
+++ b/src/security/Handshake.cc
@@ -142,6 +142,18 @@ operator <<(std::ostream &os, const DebugFrame &frame)
     return os << frame.size << "-byte type-" << frame.type << ' ' << frame.name;
 }
 
+/* Security::HandshakeParser */
+
+Security::HandshakeParser::HandshakeParser():
+    state(atHelloNone),
+    ressumingSession(false),
+    parseDone(false),
+    parseError(false),
+    currentContentType(0),
+    expectingModernRecords(false)
+{
+}
+
 void
 Security::HandshakeParser::parseVersion2Record()
 {
diff --git a/src/security/Handshake.h b/src/security/Handshake.h
index 1cad347460..6d59505f8c 100644
--- a/src/security/Handshake.h
+++ b/src/security/Handshake.h
@@ -179,7 +179,7 @@ public:
     /// The parsing states
     typedef enum {atHelloNone = 0, atHelloStarted, atHelloReceived, atCertificatesReceived, atHelloDoneReceived, atNstReceived, atCcsReceived, atFinishReceived} ParserState;
 
-    HandshakeParser(): state(atHelloNone), ressumingSession(false), parseDone(false), parseError(false), currentContentType(0), expectingModernRecords(false) {}
+    HandshakeParser();
 
     /// Parses the initial sequence of raw bytes sent by the SSL agent.
     /// Returns true upon successful completion (HelloDone or Finished received).
diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 5d296a6cb3..f3bd39c0a8 100644
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -38,7 +38,12 @@ void Security::ServerOptions::updateContextEecdh(Security::ContextPtr &) STUB
 
 #include "security/NegotiationHistory.h"
 Security::NegotiationHistory::NegotiationHistory() STUB
-void Security::NegotiationHistory::fillWith(Security::SessionPtr) STUB
+void Security::NegotiationHistory::retrieveNegotiatedInfo(Security::SessionPtr) STUB
+void Security::NegotiationHistory::retrieveParsedInfo(Security::TlsDetails::Pointer const &) STUB
 const char *Security::NegotiationHistory::cipherName() const STUB
 const char *Security::NegotiationHistory::printTlsVersion(int) const STUB
 
+#include "security/Handshake.h"
+Security::HandshakeParser::HandshakeParser() STUB
+bool Security::HandshakeParser::parseHello(const SBuf &) STUB_RETVAL(false)
+