diff options
| author | Matthias Gierlings <[email protected]> | 2016-05-13 00:42:16 +0200 |
|---|---|---|
| committer | Matthias Gierlings <[email protected]> | 2016-06-19 18:28:34 +0200 |
| commit | 89b75a5a36c18a7593aa6bdbb472e301904a66b3 (patch) | |
| tree | 2b8522fb174365ef1b880e7416feb51798e3b7cd /src/cli | |
| parent | 29e3af141c849ca6efcf755a3abb2c51a7c553e8 (diff) | |
Implemented Feedback on GH #457
- Removed deprecated TLS-Alert-Callback parameters.
- Fixed improper naming of accessor for ALPN-Strings in tls_client.h
- Fixed erroneous indentation on Ciphersuite Constructor.
Diffstat (limited to 'src/cli')
| -rw-r--r-- | src/cli/tls_client.cpp | 4 | ||||
| -rw-r--r-- | src/cli/tls_proxy.cpp | 2 | ||||
| -rw-r--r-- | src/cli/tls_server.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/cli/tls_client.cpp b/src/cli/tls_client.cpp index 7db8bacf8..f6cc2e518 100644 --- a/src/cli/tls_client.cpp +++ b/src/cli/tls_client.cpp @@ -122,7 +122,7 @@ class TLS_Client final : public Command Botan::TLS::Client client(Botan::TLS::Client::Callbacks( socket_write, std::bind(&TLS_Client::process_data, this, _1, _2), - std::bind(&TLS_Client::alert_received, this, _1, _2, _3), + std::bind(&TLS_Client::alert_received, this, _1), std::bind(&TLS_Client::handshake_complete, this, _1)), *session_mgr, creds, @@ -315,7 +315,7 @@ class TLS_Client final : public Command } } - void alert_received(Botan::TLS::Alert alert, const uint8_t [], size_t ) + void alert_received(Botan::TLS::Alert alert) { output() << "Alert: " << alert.type_string() << "\n"; } diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp index 054a8f8ca..6c5592faf 100644 --- a/src/cli/tls_proxy.cpp +++ b/src/cli/tls_proxy.cpp @@ -114,7 +114,7 @@ class tls_proxy_session : public boost::enable_shared_from_this<tls_proxy_sessio m_server_socket(io), m_tls(Botan::TLS::Server::Callbacks(boost::bind(&tls_proxy_session::tls_proxy_write_to_client, this, _1, _2), boost::bind(&tls_proxy_session::tls_client_write_to_proxy, this, _1, _2), - boost::bind(&tls_proxy_session::tls_alert_cb, this, _1, _2, _3), + boost::bind(&tls_proxy_session::tls_alert_cb, this, _1), boost::bind(&tls_proxy_session::tls_handshake_complete, this, _1)), session_manager, credentials, diff --git a/src/cli/tls_server.cpp b/src/cli/tls_server.cpp index 335f36c97..c9f0b0a79 100644 --- a/src/cli/tls_server.cpp +++ b/src/cli/tls_server.cpp @@ -110,7 +110,7 @@ class TLS_Server final : public Command Botan::TLS::Server server(Botan::TLS::Server::Callbacks( socket_write, proc_fn, - std::bind(&TLS_Server::alert_received, this, _1, _2, _3), + std::bind(&TLS_Server::alert_received, this, _1), std::bind(&TLS_Server::handshake_complete, this, _1)), session_manager, creds, @@ -238,7 +238,7 @@ class TLS_Server final : public Command } } - void alert_received(Botan::TLS::Alert alert, const uint8_t[], size_t) + void alert_received(Botan::TLS::Alert alert) { std::cout << "Alert: " << alert.type_string() << std::endl; } |