diff options
| author | lloyd <[email protected]> | 2012-01-23 15:30:29 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-23 15:30:29 +0000 |
| commit | a445f7f4a1089fc034c35c500e1572eb9518f44f (patch) | |
| tree | 3231b324a290cb9c67e9a0512a40acad8fa024a1 /src/tls/tls_channel.h | |
| parent | 8bba8bab6077ee184c102d6634b288e7dd32b1dc (diff) | |
Since this branch is hugely API breaking already, go ahead and put
everything into a new namespace (Botan::TLS), removing the TLS_
prefixes on everything.
Diffstat (limited to 'src/tls/tls_channel.h')
| -rw-r--r-- | src/tls/tls_channel.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h index 2b4e6d161..6021b65b2 100644 --- a/src/tls/tls_channel.h +++ b/src/tls/tls_channel.h @@ -16,10 +16,12 @@ namespace Botan { +namespace TLS { + /** * Generic interface for TLS endpoint */ -class BOTAN_DLL TLS_Channel +class BOTAN_DLL Channel { public: /** @@ -59,11 +61,11 @@ class BOTAN_DLL TLS_Channel */ std::vector<X509_Certificate> peer_cert_chain() const { return peer_certs; } - TLS_Channel(std::tr1::function<void (const byte[], size_t)> socket_output_fn, + Channel(std::tr1::function<void (const byte[], size_t)> socket_output_fn, std::tr1::function<void (const byte[], size_t, u16bit)> proc_fn, - std::tr1::function<bool (const TLS_Session&)> handshake_complete); + std::tr1::function<bool (const Session&)> handshake_complete); - virtual ~TLS_Channel(); + virtual ~Channel(); protected: /** @@ -83,14 +85,14 @@ class BOTAN_DLL TLS_Channel virtual void alert_notify(bool fatal_alert, Alert_Type type) = 0; std::tr1::function<void (const byte[], size_t, u16bit)> proc_fn; - std::tr1::function<bool (const TLS_Session&)> handshake_fn; + std::tr1::function<bool (const Session&)> handshake_fn; Record_Writer writer; Record_Reader reader; std::vector<X509_Certificate> peer_certs; - class TLS_Handshake_State* state; + class Handshake_State* state; class Secure_Renegotiation_State { @@ -131,4 +133,6 @@ class BOTAN_DLL TLS_Channel } +} + #endif |