diff options
| author | louiz’ <louiz@louiz.org> | 2017-10-04 21:25:27 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-10-04 21:51:58 +0200 |
| commit | c5a02685361b95042d5c2ada58cba851bc1cc37a (patch) | |
| tree | bc6c7fa63fe490d946c49a8e2e32550fc884fb56 | |
| parent | 1c3d4f6f5fdf5829e931770523251abe9522914b (diff) | |
| download | biboumi-c5a02685361b95042d5c2ada58cba851bc1cc37a.tar.gz biboumi-c5a02685361b95042d5c2ada58cba851bc1cc37a.tar.bz2 biboumi-c5a02685361b95042d5c2ada58cba851bc1cc37a.tar.xz biboumi-c5a02685361b95042d5c2ada58cba851bc1cc37a.zip | |
Explicitely include all needed botan headers
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
| -rw-r--r-- | src/network/credentials_manager.cpp | 1 | ||||
| -rw-r--r-- | src/network/credentials_manager.hpp | 3 | ||||
| -rw-r--r-- | src/network/tcp_socket_handler.cpp | 1 | ||||
| -rw-r--r-- | src/network/tcp_socket_handler.hpp | 1 | ||||
| -rw-r--r-- | src/network/tls_policy.cpp | 2 |
5 files changed, 6 insertions, 2 deletions
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) { |