aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-02-27 17:10:42 +0000
committerlloyd <[email protected]>2012-02-27 17:10:42 +0000
commitafcb8db8ad2b39c6b80467a3d21d32e440b973d5 (patch)
tree13b3e180052f69bd713cbea277b6e1148f31beb4 /src
parent24c1546324995da70c51137ad138c3bb997a37b9 (diff)
Indentation
Diffstat (limited to 'src')
-rw-r--r--src/tls/tls_channel.h4
-rw-r--r--src/tls/tls_client.cpp16
-rw-r--r--src/tls/tls_client.h18
-rw-r--r--src/tls/tls_server.h16
-rw-r--r--src/tls/tls_session.cpp20
-rw-r--r--src/tls/tls_session_manager.h2
6 files changed, 38 insertions, 38 deletions
diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h
index aa171ca4b..53af0bdfc 100644
--- a/src/tls/tls_channel.h
+++ b/src/tls/tls_channel.h
@@ -63,8 +63,8 @@ class BOTAN_DLL Channel
std::vector<X509_Certificate> peer_cert_chain() const { return peer_certs; }
Channel(std::tr1::function<void (const byte[], size_t)> socket_output_fn,
- std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
- std::tr1::function<bool (const Session&)> handshake_complete);
+ std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
+ std::tr1::function<bool (const Session&)> handshake_complete);
virtual ~Channel();
protected:
diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp
index 8b5ea9347..00e2dc311 100644
--- a/src/tls/tls_client.cpp
+++ b/src/tls/tls_client.cpp
@@ -19,14 +19,14 @@ namespace TLS {
* TLS Client Constructor
*/
Client::Client(std::tr1::function<void (const byte[], size_t)> output_fn,
- std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
- std::tr1::function<bool (const Session&)> handshake_fn,
- Session_Manager& session_manager,
- Credentials_Manager& creds,
- const Policy& policy,
- RandomNumberGenerator& rng,
- const std::string& hostname,
- std::tr1::function<std::string (std::vector<std::string>)> next_protocol) :
+ std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
+ std::tr1::function<bool (const Session&)> handshake_fn,
+ Session_Manager& session_manager,
+ Credentials_Manager& creds,
+ const Policy& policy,
+ RandomNumberGenerator& rng,
+ const std::string& hostname,
+ std::tr1::function<std::string (std::vector<std::string>)> next_protocol) :
Channel(output_fn, proc_fn, handshake_fn),
policy(policy),
rng(rng),
diff --git a/src/tls/tls_client.h b/src/tls/tls_client.h
index f5528f4c1..5c2692cd6 100644
--- a/src/tls/tls_client.h
+++ b/src/tls/tls_client.h
@@ -43,15 +43,15 @@ class BOTAN_DLL Client : public Channel
* the client should return the protocol it would like to use.
*/
Client(std::tr1::function<void (const byte[], size_t)> socket_output_fn,
- std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
- std::tr1::function<bool (const Session&)> handshake_complete,
- Session_Manager& session_manager,
- Credentials_Manager& creds,
- const Policy& policy,
- RandomNumberGenerator& rng,
- const std::string& servername = "",
- std::tr1::function<std::string (std::vector<std::string>)> next_protocol =
- std::tr1::function<std::string (std::vector<std::string>)>());
+ std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
+ std::tr1::function<bool (const Session&)> handshake_complete,
+ Session_Manager& session_manager,
+ Credentials_Manager& creds,
+ const Policy& policy,
+ RandomNumberGenerator& rng,
+ const std::string& servername = "",
+ std::tr1::function<std::string (std::vector<std::string>)> next_protocol =
+ std::tr1::function<std::string (std::vector<std::string>)>());
void renegotiate();
private:
diff --git a/src/tls/tls_server.h b/src/tls/tls_server.h
index bb385e420..025bbf3ec 100644
--- a/src/tls/tls_server.h
+++ b/src/tls/tls_server.h
@@ -27,14 +27,14 @@ class BOTAN_DLL Server : public Channel
* Server initialization
*/
Server(std::tr1::function<void (const byte[], size_t)> socket_output_fn,
- std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
- std::tr1::function<bool (const Session&)> handshake_complete,
- Session_Manager& session_manager,
- Credentials_Manager& creds,
- const Policy& policy,
- RandomNumberGenerator& rng,
- const std::vector<std::string>& protocols =
- std::vector<std::string>());
+ std::tr1::function<void (const byte[], size_t, Alert)> proc_fn,
+ std::tr1::function<bool (const Session&)> handshake_complete,
+ Session_Manager& session_manager,
+ Credentials_Manager& creds,
+ const Policy& policy,
+ RandomNumberGenerator& rng,
+ const std::vector<std::string>& protocols =
+ std::vector<std::string>());
void renegotiate();
diff --git a/src/tls/tls_session.cpp b/src/tls/tls_session.cpp
index 2e25a8ab3..320f3c004 100644
--- a/src/tls/tls_session.cpp
+++ b/src/tls/tls_session.cpp
@@ -17,16 +17,16 @@ namespace Botan {
namespace TLS {
Session::Session(const MemoryRegion<byte>& session_identifier,
- const MemoryRegion<byte>& master_secret,
- Protocol_Version version,
- u16bit ciphersuite,
- byte compression_method,
- Connection_Side side,
- bool secure_renegotiation_supported,
- size_t fragment_size,
- const std::vector<X509_Certificate>& certs,
- const std::string& sni_hostname,
- const std::string& srp_identifier) :
+ const MemoryRegion<byte>& master_secret,
+ Protocol_Version version,
+ u16bit ciphersuite,
+ byte compression_method,
+ Connection_Side side,
+ bool secure_renegotiation_supported,
+ size_t fragment_size,
+ const std::vector<X509_Certificate>& certs,
+ const std::string& sni_hostname,
+ const std::string& srp_identifier) :
m_start_time(system_time()),
m_identifier(session_identifier),
m_master_secret(master_secret),
diff --git a/src/tls/tls_session_manager.h b/src/tls/tls_session_manager.h
index c25fecac4..c0a9996e3 100644
--- a/src/tls/tls_session_manager.h
+++ b/src/tls/tls_session_manager.h
@@ -82,7 +82,7 @@ class BOTAN_DLL Session_Manager_In_Memory : public Session_Manager
* seconds have elapsed from initial handshake.
*/
Session_Manager_In_Memory(size_t max_sessions = 1000,
- size_t session_lifetime = 7200) :
+ size_t session_lifetime = 7200) :
max_sessions(max_sessions),
session_lifetime(session_lifetime)
{}