diff options
author | louiz’ <louiz@louiz.org> | 2017-07-20 21:22:58 +0200 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2017-07-20 21:22:58 +0200 |
commit | ffb402f0adb9f808c7b8bc9616e71f7b3f8931ac (patch) | |
tree | 074862e68c2c0d055d87a1be99947171c839bae6 /src/network/tcp_socket_handler.cpp | |
parent | f0f3d3d4e2fb7c02a5b2ad517632ec5071fefb45 (diff) | |
download | biboumi-ffb402f0adb9f808c7b8bc9616e71f7b3f8931ac.tar.gz biboumi-ffb402f0adb9f808c7b8bc9616e71f7b3f8931ac.tar.bz2 biboumi-ffb402f0adb9f808c7b8bc9616e71f7b3f8931ac.tar.xz biboumi-ffb402f0adb9f808c7b8bc9616e71f7b3f8931ac.zip |
Drop support for botan < 2.0
fix #3274
Diffstat (limited to 'src/network/tcp_socket_handler.cpp')
-rw-r--r-- | src/network/tcp_socket_handler.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp index 1049375..6239162 100644 --- a/src/network/tcp_socket_handler.cpp +++ b/src/network/tcp_socket_handler.cpp @@ -237,14 +237,7 @@ void TCPSocketHandler::start_tls(const std::string& address, const std::string& this->policy.load(policy_directory + "policy.txt"); this->policy.load(policy_directory + address + ".policy.txt"); this->tls = std::make_unique<Botan::TLS::Client>( -# if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,32) *this, -# else - [this](const Botan::byte* data, size_t size) { this->tls_emit_data(data, size); }, - [this](const Botan::byte* data, size_t size) { this->tls_record_received(0, data, size); }, - [this](Botan::TLS::Alert alert, const Botan::byte*, size_t) { this->tls_alert(alert); }, - [this](const Botan::TLS::Session& session) { return this->tls_session_established(session); }, -# endif get_session_manager(), this->credential_manager, this->policy, get_rng(), server_info, Botan::TLS::Protocol_Version::latest_tls_version()); } @@ -327,7 +320,6 @@ bool TCPSocketHandler::tls_session_established(const Botan::TLS::Session& sessio return true; } -#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,34) void TCPSocketHandler::tls_verify_cert_chain(const std::vector<Botan::X509_Certificate>& cert_chain, const std::vector<std::shared_ptr<const Botan::OCSP::Response>>& ocsp_responses, const std::vector<Botan::Certificate_Store*>& trusted_roots, @@ -350,7 +342,6 @@ void TCPSocketHandler::tls_verify_cert_chain(const std::vector<Botan::X509_Certi check_tls_certificate(cert_chain, hostname, this->credential_manager.get_trusted_fingerprint(), exception_ptr); } } -#endif void TCPSocketHandler::on_tls_activated() { |