diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tls/info.txt | 2 | ||||
| -rw-r--r-- | src/tls/tls_blocking.cpp | 10 | ||||
| -rw-r--r-- | src/tls/tls_blocking.h | 7 | ||||
| -rw-r--r-- | src/tls/tls_policy.h | 4 |
4 files changed, 7 insertions, 16 deletions
diff --git a/src/tls/info.txt b/src/tls/info.txt index 47de42598..5bc64b44e 100644 --- a/src/tls/info.txt +++ b/src/tls/info.txt @@ -9,6 +9,7 @@ serious bugs or security issues. <header:public> tls_alert.h +tls_blocking.h tls_channel.h tls_ciphersuite.h tls_client.h @@ -49,6 +50,7 @@ msg_server_hello.cpp msg_server_kex.cpp msg_session_ticket.cpp tls_alert.cpp +tls_blocking.cpp tls_channel.cpp tls_ciphersuite.cpp tls_client.cpp diff --git a/src/tls/tls_blocking.cpp b/src/tls/tls_blocking.cpp index e0f31b1ca..ee94f086e 100644 --- a/src/tls/tls_blocking.cpp +++ b/src/tls/tls_blocking.cpp @@ -25,7 +25,7 @@ Blocking_Client::Blocking_Client(std::function<size_t (byte[], size_t)> read_fn, m_read_fn(read_fn), m_channel(write_fn, std::bind(&Blocking_Client::process_data, this, _1, _2, _3), - std::bind(&Blocking_Client::handshake_complete, this, _1, _2, _3), + std::bind(&Blocking_Client::handshake_complete, this, _1), session_manager, creds, policy, @@ -36,14 +36,6 @@ Blocking_Client::Blocking_Client(std::function<size_t (byte[], size_t)> read_fn, { } -#if 0 -Blocking_Client::Blocking_Client(std::function<size_t (byte[], size_t)> read_fn, - std::function<void (const byte[], size_t)> write_fn, - const TLS_Policy& policy, - RandomNumberGenerator& rng) : - m_read_fn(read_fn) -#endif - bool Blocking_Client::handshake_complete_cb(const Session& session) { return this->handshake_complete(session); diff --git a/src/tls/tls_blocking.h b/src/tls/tls_blocking.h index d024cf894..955413be1 100644 --- a/src/tls/tls_blocking.h +++ b/src/tls/tls_blocking.h @@ -36,12 +36,6 @@ class BOTAN_DLL Blocking_Client std::function<std::string (std::vector<std::string>)> next_protocol = std::function<std::string (std::vector<std::string>)>()); - // Constructor like the 1.10 Client API - Blocking_Client(std::function<size_t (byte[], size_t)> read_fn, - std::function<void (const byte[], size_t)> write_fn, - const Policy& policy, - RandomNumberGenerator& rng); - size_t currently_readable() const { return m_plaintext.size(); } size_t read(byte buf[], size_t buf_len); // blocking read @@ -70,6 +64,7 @@ class BOTAN_DLL Blocking_Client * Can override to get notification of alerts */ virtual void alert_notification(const Alert&) {} + private: bool handshake_complete_cb(const Session&); diff --git a/src/tls/tls_policy.h b/src/tls/tls_policy.h index cc02dd9b1..125faa665 100644 --- a/src/tls/tls_policy.h +++ b/src/tls/tls_policy.h @@ -62,9 +62,11 @@ class BOTAN_DLL Policy virtual std::vector<std::string> allowed_ecc_curves() const; /** - * Returns a list of signature algorithms we are willing to use, + * Returns a list of compression algorithms we are willing to use, * in order of preference. Allowed values any value of * Compression_Method. + * + * @note Compression is not currently supported */ virtual std::vector<byte> compression() const; |