diff options
| author | lloyd <[email protected]> | 2012-09-07 17:23:40 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-09-07 17:23:40 +0000 |
| commit | fa155f8caf5079af767d999356469cf059bca35a (patch) | |
| tree | c8d4c422939d30077e284fa3a1452d3bad22b17d | |
| parent | 6925789077edbeab13540cde3cf84b1d0e6feefc (diff) | |
Single predecl of Handshake_State saves some noise
| -rw-r--r-- | src/tls/tls_channel.h | 14 | ||||
| -rw-r--r-- | src/tls/tls_client.h | 6 | ||||
| -rw-r--r-- | src/tls/tls_server.h | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h index 109fbc771..6f52923e6 100644 --- a/src/tls/tls_channel.h +++ b/src/tls/tls_channel.h @@ -21,6 +21,8 @@ namespace Botan { namespace TLS { +class Handshake_State; + /** * Generic interface for TLS endpoint */ @@ -96,16 +98,16 @@ class BOTAN_DLL Channel virtual ~Channel(); protected: - virtual void process_handshake_msg(class Handshake_State& state, + virtual void process_handshake_msg(Handshake_State& state, Handshake_Type type, const std::vector<byte>& contents) = 0; - virtual void initiate_handshake(class Handshake_State& state, + virtual void initiate_handshake(Handshake_State& state, bool force_full_renegotiation) = 0; - virtual class Handshake_State* new_handshake_state() = 0; + virtual Handshake_State* new_handshake_state() = 0; - class Handshake_State& create_handshake_state(); + Handshake_State& create_handshake_state(); /** * Send a TLS alert message. If the alert is fatal, the internal @@ -194,8 +196,8 @@ class BOTAN_DLL Channel u64bit m_read_seq_no = 0; /* connection parameters */ - std::unique_ptr<class Handshake_State> m_active_state; - std::unique_ptr<class Handshake_State> m_pending_state; + std::unique_ptr<Handshake_State> m_active_state; + std::unique_ptr<Handshake_State> m_pending_state; Protocol_Version m_current_version; size_t m_max_fragment = MAX_PLAINTEXT_SIZE; diff --git a/src/tls/tls_client.h b/src/tls/tls_client.h index 7f99cd637..454b548cc 100644 --- a/src/tls/tls_client.h +++ b/src/tls/tls_client.h @@ -66,10 +66,10 @@ class BOTAN_DLL Client : public Channel std::function<std::string (std::vector<std::string>)> next_protocol = std::function<std::string (std::vector<std::string>)>()); private: - void initiate_handshake(class Handshake_State& state, + void initiate_handshake(Handshake_State& state, bool force_full_renegotiation) override; - void initiate_handshake(class Handshake_State& state, + void initiate_handshake(Handshake_State& state, bool force_full_renegotiation, Protocol_Version version, const std::string& srp_identifier = "", @@ -80,7 +80,7 @@ class BOTAN_DLL Client : public Channel Handshake_Type type, const std::vector<byte>& contents) override; - class Handshake_State* new_handshake_state() override; + Handshake_State* new_handshake_state() override; const Policy& m_policy; Credentials_Manager& m_creds; diff --git a/src/tls/tls_server.h b/src/tls/tls_server.h index 23e4c3317..fe8f44531 100644 --- a/src/tls/tls_server.h +++ b/src/tls/tls_server.h @@ -48,14 +48,14 @@ class BOTAN_DLL Server : public Channel { return m_next_protocol; } private: - void initiate_handshake(class Handshake_State& state, + void initiate_handshake(Handshake_State& state, bool force_full_renegotiation) override; void process_handshake_msg(Handshake_State& state, Handshake_Type type, const std::vector<byte>& contents) override; - class Handshake_State* new_handshake_state() override; + Handshake_State* new_handshake_state() override; const Policy& m_policy; Credentials_Manager& m_creds; |