From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 27 Jul 2016 21:16:35 +0000 (+1200)
Subject: Cleanup: sort stub_libsecurity
X-Git-Tag: SQUID_4_0_13~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e652c645ad830aa2695ec5decb0ff9f95590d5;p=thirdparty%2Fsquid.git

Cleanup: sort stub_libsecurity
---

diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 02e9bca00f..f8c0f2da0b 100644
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -14,30 +14,21 @@
 #define STUB_API "security/libsecurity.la"
 #include "tests/STUB.h"
 
+#include "security/BlindPeerConnector.h"
+CBDATA_NAMESPACED_CLASS_INIT(Security, BlindPeerConnector);
+namespace Security
+{
+bool BlindPeerConnector::initializeTls(Security::SessionPointer &) STUB_RETVAL(false)
+Security::ContextPtr BlindPeerConnector::getSslContext() STUB_RETVAL(nullptr)
+void BlindPeerConnector::noteNegotiationDone(ErrorState *) STUB
+}
 #include "security/EncryptorAnswer.h"
 Security::EncryptorAnswer::~EncryptorAnswer() {}
 std::ostream &Security::operator <<(std::ostream &os, const Security::EncryptorAnswer &) STUB_RETVAL(os)
 
-#include "security/PeerOptions.h"
-Security::PeerOptions Security::ProxyOutgoingConfig;
-void Security::PeerOptions::parse(char const*) STUB
-Security::ContextPtr Security::PeerOptions::createClientContext(bool) STUB_RETVAL(NULL)
-void Security::PeerOptions::updateTlsVersionLimits() STUB
-Security::ContextPtr Security::PeerOptions::createBlankContext() const STUB
-void Security::PeerOptions::updateContextCa(Security::ContextPtr &) STUB
-void Security::PeerOptions::updateContextCrl(Security::ContextPtr &) STUB
-void Security::PeerOptions::dumpCfg(Packable*, char const*) const STUB
-long Security::PeerOptions::parseOptions() STUB_RETVAL(0)
-long Security::PeerOptions::parseFlags() STUB_RETVAL(0)
-void parse_securePeerOptions(Security::PeerOptions *) STUB
-
-#include "security/ServerOptions.h"
-//Security::ServerOptions::ServerOptions(const Security::ServerOptions &) STUB
-void Security::ServerOptions::parse(const char *) STUB
-void Security::ServerOptions::dumpCfg(Packable *, const char *) const STUB
-Security::ContextPtr Security::ServerOptions::createBlankContext() const STUB
-bool Security::ServerOptions::createStaticServerContext(AnyP::PortCfg &) STUB_RETVAL(false)
-void Security::ServerOptions::updateContextEecdh(Security::ContextPtr &) STUB
+#include "security/Handshake.h"
+Security::HandshakeParser::HandshakeParser() STUB
+bool Security::HandshakeParser::parseHello(const SBuf &) STUB_RETVAL(false)
 
 #include "security/NegotiationHistory.h"
 Security::NegotiationHistory::NegotiationHistory() STUB
@@ -46,10 +37,6 @@ void Security::NegotiationHistory::retrieveParsedInfo(Security::TlsDetails::Poin
 const char *Security::NegotiationHistory::cipherName() const STUB
 const char *Security::NegotiationHistory::printTlsVersion(AnyP::ProtocolVersion const &v) const STUB
 
-#include "security/Handshake.h"
-Security::HandshakeParser::HandshakeParser() STUB
-bool Security::HandshakeParser::parseHello(const SBuf &) STUB_RETVAL(false)
-
 #include "security/PeerConnector.h"
 CBDATA_NAMESPACED_CLASS_INIT(Security, PeerConnector);
 namespace Security
@@ -78,12 +65,24 @@ void PeerConnector::callBack() STUB
 void PeerConnector::recordNegotiationDetails() STUB
 }
 
-#include "security/BlindPeerConnector.h"
-CBDATA_NAMESPACED_CLASS_INIT(Security, BlindPeerConnector);
-namespace Security
-{
-bool BlindPeerConnector::initializeTls(Security::SessionPointer &) STUB_RETVAL(false)
-Security::ContextPtr BlindPeerConnector::getSslContext() STUB_RETVAL(nullptr)
-void BlindPeerConnector::noteNegotiationDone(ErrorState *) STUB
-}
+#include "security/PeerOptions.h"
+Security::PeerOptions Security::ProxyOutgoingConfig;
+void Security::PeerOptions::parse(char const*) STUB
+Security::ContextPtr Security::PeerOptions::createClientContext(bool) STUB_RETVAL(NULL)
+void Security::PeerOptions::updateTlsVersionLimits() STUB
+Security::ContextPtr Security::PeerOptions::createBlankContext() const STUB
+void Security::PeerOptions::updateContextCa(Security::ContextPtr &) STUB
+void Security::PeerOptions::updateContextCrl(Security::ContextPtr &) STUB
+void Security::PeerOptions::dumpCfg(Packable*, char const*) const STUB
+long Security::PeerOptions::parseOptions() STUB_RETVAL(0)
+long Security::PeerOptions::parseFlags() STUB_RETVAL(0)
+void parse_securePeerOptions(Security::PeerOptions *) STUB
+
+#include "security/ServerOptions.h"
+//Security::ServerOptions::ServerOptions(const Security::ServerOptions &) STUB
+void Security::ServerOptions::parse(const char *) STUB
+void Security::ServerOptions::dumpCfg(Packable *, const char *) const STUB
+Security::ContextPtr Security::ServerOptions::createBlankContext() const STUB
+bool Security::ServerOptions::createStaticServerContext(AnyP::PortCfg &) STUB_RETVAL(false)
+void Security::ServerOptions::updateContextEecdh(Security::ContextPtr &) STUB