summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-01-17 20:59:38 +0100
committerlouiz’ <louiz@louiz.org>2018-01-17 20:59:38 +0100
commit520711023f82bc0828a7af9459eabb155bf42566 (patch)
treee98b4d3f68fc2196baa7cb579d96597a935589c9 /src/network
parent1bb3e2e7da6778814f4a89787d8ab54c6e2d1760 (diff)
downloadbiboumi-520711023f82bc0828a7af9459eabb155bf42566.tar.gz
biboumi-520711023f82bc0828a7af9459eabb155bf42566.tar.bz2
biboumi-520711023f82bc0828a7af9459eabb155bf42566.tar.xz
biboumi-520711023f82bc0828a7af9459eabb155bf42566.zip
Use our botan gh#1276 workaround only for botan < 2.4
fix #3320
Diffstat (limited to 'src/network')
-rw-r--r--src/network/tcp_socket_handler.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index 602cf94..642cf03 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -12,6 +12,7 @@
#include <cstring>
#ifdef BOTAN_FOUND
+# include <botan/version.h>
# include <botan/hex.h>
# include <botan/auto_rng.h>
# include <botan/tls_exceptn.h>
@@ -28,8 +29,10 @@ namespace
Botan::TLS::Session_Manager_In_Memory& get_session_manager()
{
static Botan::TLS::Session_Manager_In_Memory session_manager{get_rng()};
+#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(2,4,0)
// workaround for https://github.com/randombit/botan/issues/1276
session_manager.remove_all();
+#endif
return session_manager;
}
}