From 520711023f82bc0828a7af9459eabb155bf42566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 17 Jan 2018 20:59:38 +0100
Subject: Use our botan gh#1276 workaround only for botan < 2.4
fix #3320
---
src/network/tcp_socket_handler.cpp | 3 +++
1 file changed, 3 insertions(+)
(limited to 'src')
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;
}
}
--
cgit v1.2.3