From c5a02685361b95042d5c2ada58cba851bc1cc37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 4 Oct 2017 21:25:27 +0200
Subject: Explicitely include all needed botan headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most importantely, include parsing.h, since read_cfg is not implicitely
included anymore in botan 2.3, and that does not compile.

Also do not included botan.h anymore, since it’s deprecated in botan 2.3

fix #3296
---
 src/network/credentials_manager.cpp | 1 +
 src/network/credentials_manager.hpp | 3 ++-
 src/network/tcp_socket_handler.cpp  | 1 +
 src/network/tcp_socket_handler.hpp  | 1 -
 src/network/tls_policy.cpp          | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/network')

diff --git a/src/network/credentials_manager.cpp b/src/network/credentials_manager.cpp
index 7f07cef..b25f442 100644
--- a/src/network/credentials_manager.cpp
+++ b/src/network/credentials_manager.cpp
@@ -5,6 +5,7 @@
 #include <network/credentials_manager.hpp>
 #include <logger/logger.hpp>
 #include <botan/tls_exceptn.h>
+#include <botan/data_src.h>
 #include <config/config.hpp>
 
 /**
diff --git a/src/network/credentials_manager.hpp b/src/network/credentials_manager.hpp
index aa4732a..3a37bdc 100644
--- a/src/network/credentials_manager.hpp
+++ b/src/network/credentials_manager.hpp
@@ -4,7 +4,8 @@
 
 #ifdef BOTAN_FOUND
 
-#include <botan/botan.h>
+#include <botan/credentials_manager.h>
+#include <botan/certstor.h>
 #include <botan/tls_client.h>
 
 class TCPSocketHandler;
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index 6239162..343ec56 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -13,6 +13,7 @@
 
 #ifdef BOTAN_FOUND
 # include <botan/hex.h>
+# include <botan/auto_rng.h>
 # include <botan/tls_exceptn.h>
 # include <config/config.hpp>
 # include <utils/dirname.hpp>
diff --git a/src/network/tcp_socket_handler.hpp b/src/network/tcp_socket_handler.hpp
index 5cef739..c598641 100644
--- a/src/network/tcp_socket_handler.hpp
+++ b/src/network/tcp_socket_handler.hpp
@@ -21,7 +21,6 @@
 #ifdef BOTAN_FOUND
 
 # include <botan/types.h>
-# include <botan/botan.h>
 # include <botan/tls_session_manager.h>
 # include <network/tls_policy.hpp>
 
diff --git a/src/network/tls_policy.cpp b/src/network/tls_policy.cpp
index 5439397..b88eb88 100644
--- a/src/network/tls_policy.cpp
+++ b/src/network/tls_policy.cpp
@@ -8,6 +8,8 @@
 
 #include <network/tls_policy.hpp>
 #include <logger/logger.hpp>
+#include <botan/parsing.h>
+#include <botan/exceptn.h>
 
 bool BiboumiTLSPolicy::load(const std::string& filename)
 {
-- 
cgit v1.2.3


From f3b1e39cdd7c55c914659f5ac103c3a0855f8f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Thu, 26 Oct 2017 19:13:23 +0200
Subject: Add a workaround for https://github.com/randombit/botan/issues/1276

ref #3278
---
 src/network/tcp_socket_handler.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/network')

diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index 343ec56..602cf94 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -28,6 +28,8 @@ namespace
     Botan::TLS::Session_Manager_In_Memory& get_session_manager()
     {
       static Botan::TLS::Session_Manager_In_Memory session_manager{get_rng()};
+      // workaround for https://github.com/randombit/botan/issues/1276
+      session_manager.remove_all();
       return session_manager;
     }
 }
-- 
cgit v1.2.3


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/network')

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