diff options
| author | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
| commit | 56651cb5c29cc50ddf3c62c37167fa0b9389bfde (patch) | |
| tree | ca652963cafeb02b0c6c7504b1cfbc27abdafe0b /src/network/tcp_socket_handler.cpp | |
| parent | ad1e0f8d52189e18df2d5a39228e255798a9de70 (diff) | |
| parent | e0d1a0b44add408504e428d6ce4a8a2121ea7a00 (diff) | |
| download | biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.gz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.bz2 biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.xz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.zip | |
Merge branch 'master' into debian
Diffstat (limited to 'src/network/tcp_socket_handler.cpp')
| -rw-r--r-- | src/network/tcp_socket_handler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp index 6239162..642cf03 100644 --- a/src/network/tcp_socket_handler.cpp +++ b/src/network/tcp_socket_handler.cpp @@ -12,7 +12,9 @@ #include <cstring> #ifdef BOTAN_FOUND +# include <botan/version.h> # include <botan/hex.h> +# include <botan/auto_rng.h> # include <botan/tls_exceptn.h> # include <config/config.hpp> # include <utils/dirname.hpp> @@ -27,6 +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; } } |