diff options
Diffstat (limited to 'src/lib/tls')
32 files changed, 19 insertions, 30 deletions
diff --git a/src/lib/tls/credentials_manager.cpp b/src/lib/tls/credentials_manager.cpp index c59933762..9a7e25ddf 100644 --- a/src/lib/tls/credentials_manager.cpp +++ b/src/lib/tls/credentials_manager.cpp @@ -6,7 +6,6 @@ */ #include <botan/credentials_manager.h> -#include <botan/x509path.h> namespace Botan { diff --git a/src/lib/tls/msg_cert_req.cpp b/src/lib/tls/msg_cert_req.cpp index 6488034ef..c6d09481e 100644 --- a/src/lib/tls/msg_cert_req.cpp +++ b/src/lib/tls/msg_cert_req.cpp @@ -12,7 +12,6 @@ #include <botan/internal/tls_handshake_hash.h> #include <botan/der_enc.h> #include <botan/ber_dec.h> -#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/tls/msg_certificate.cpp b/src/lib/tls/msg_certificate.cpp index e00bec926..a2a48ceea 100644 --- a/src/lib/tls/msg_certificate.cpp +++ b/src/lib/tls/msg_certificate.cpp @@ -10,9 +10,8 @@ #include <botan/internal/tls_reader.h> #include <botan/internal/tls_handshake_io.h> #include <botan/internal/tls_handshake_hash.h> -#include <botan/der_enc.h> -#include <botan/ber_dec.h> #include <botan/loadstor.h> +#include <botan/data_src.h> namespace Botan { diff --git a/src/lib/tls/msg_client_hello.cpp b/src/lib/tls/msg_client_hello.cpp index 3dc3127b9..bb7d84df8 100644 --- a/src/lib/tls/msg_client_hello.cpp +++ b/src/lib/tls/msg_client_hello.cpp @@ -9,6 +9,7 @@ #include <botan/tls_messages.h> #include <botan/tls_alert.h> #include <botan/tls_exceptn.h> +#include <botan/rng.h> #include <botan/internal/tls_reader.h> #include <botan/internal/tls_session_key.h> #include <botan/internal/tls_handshake_io.h> diff --git a/src/lib/tls/msg_client_kex.cpp b/src/lib/tls/msg_client_kex.cpp index 2d132af04..3291b6eb5 100644 --- a/src/lib/tls/msg_client_kex.cpp +++ b/src/lib/tls/msg_client_kex.cpp @@ -7,13 +7,13 @@ #include <botan/tls_messages.h> #include <botan/tls_extensions.h> +#include <botan/rng.h> + #include <botan/internal/tls_reader.h> #include <botan/internal/tls_handshake_io.h> #include <botan/internal/tls_handshake_state.h> #include <botan/internal/tls_handshake_hash.h> #include <botan/credentials_manager.h> -#include <botan/rng.h> -#include <botan/loadstor.h> #include <botan/internal/ct_utils.h> #include <botan/pubkey.h> diff --git a/src/lib/tls/msg_finished.cpp b/src/lib/tls/msg_finished.cpp index 0fbfc0738..47c875a51 100644 --- a/src/lib/tls/msg_finished.cpp +++ b/src/lib/tls/msg_finished.cpp @@ -6,6 +6,7 @@ */ #include <botan/tls_messages.h> +#include <botan/kdf.h> #include <botan/internal/tls_handshake_io.h> #include <botan/internal/tls_handshake_state.h> diff --git a/src/lib/tls/msg_server_kex.cpp b/src/lib/tls/msg_server_kex.cpp index 17f5cad4f..97ac4ac8f 100644 --- a/src/lib/tls/msg_server_kex.cpp +++ b/src/lib/tls/msg_server_kex.cpp @@ -13,7 +13,6 @@ #include <botan/credentials_manager.h> #include <botan/loadstor.h> #include <botan/pubkey.h> -#include <botan/oids.h> #include <botan/dh.h> #include <botan/ecdh.h> diff --git a/src/lib/tls/msg_session_ticket.cpp b/src/lib/tls/msg_session_ticket.cpp index 28204958f..b9bf7e94d 100644 --- a/src/lib/tls/msg_session_ticket.cpp +++ b/src/lib/tls/msg_session_ticket.cpp @@ -6,7 +6,6 @@ */ #include <botan/tls_messages.h> -#include <botan/tls_extensions.h> #include <botan/internal/tls_reader.h> #include <botan/internal/tls_handshake_io.h> #include <botan/internal/tls_handshake_hash.h> diff --git a/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp b/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp index 594822829..4287172f4 100644 --- a/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp +++ b/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp @@ -9,6 +9,7 @@ #include <botan/database.h> #include <botan/pbkdf.h> #include <botan/hex.h> +#include <botan/rng.h> #include <botan/loadstor.h> #include <chrono> diff --git a/src/lib/tls/sessions_sql/tls_session_manager_sql.h b/src/lib/tls/sessions_sql/tls_session_manager_sql.h index a334cb687..d96a8b5bb 100644 --- a/src/lib/tls/sessions_sql/tls_session_manager_sql.h +++ b/src/lib/tls/sessions_sql/tls_session_manager_sql.h @@ -10,10 +10,11 @@ #include <botan/tls_session_manager.h> #include <botan/database.h> -#include <botan/rng.h> namespace Botan { +class RandomNumberGenerator; + namespace TLS { /** diff --git a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h index 797180687..bd092c5b0 100644 --- a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h +++ b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h @@ -9,10 +9,11 @@ #define BOTAN_TLS_SQLITE3_SESSION_MANAGER_H_ #include <botan/tls_session_manager_sql.h> -#include <botan/rng.h> namespace Botan { +class RandomNumberGenerator; + namespace TLS { /** diff --git a/src/lib/tls/tls_blocking.h b/src/lib/tls/tls_blocking.h index 851bf846c..01620c652 100644 --- a/src/lib/tls/tls_blocking.h +++ b/src/lib/tls/tls_blocking.h @@ -10,13 +10,9 @@ #define BOTAN_TLS_BLOCKING_CHANNELS_H_ #include <botan/tls_client.h> -#include <botan/tls_server.h> -#include <deque> namespace Botan { -//template<typename T> using secure_deque = std::vector<T, secure_allocator<T>>; - namespace TLS { /** diff --git a/src/lib/tls/tls_callbacks.cpp b/src/lib/tls/tls_callbacks.cpp index 45d0518eb..59620aec2 100644 --- a/src/lib/tls/tls_callbacks.cpp +++ b/src/lib/tls/tls_callbacks.cpp @@ -9,7 +9,6 @@ #include <botan/tls_policy.h> #include <botan/x509path.h> #include <botan/ocsp.h> -#include <botan/certstor.h> namespace Botan { diff --git a/src/lib/tls/tls_cbc/tls_cbc.cpp b/src/lib/tls/tls_cbc/tls_cbc.cpp index 244ddfb99..69aa9725d 100644 --- a/src/lib/tls/tls_cbc/tls_cbc.cpp +++ b/src/lib/tls/tls_cbc/tls_cbc.cpp @@ -12,7 +12,6 @@ #include <botan/internal/rounding.h> #include <botan/internal/ct_utils.h> #include <botan/tls_alert.h> -#include <botan/tls_magic.h> #include <botan/tls_exceptn.h> namespace Botan { diff --git a/src/lib/tls/tls_channel.cpp b/src/lib/tls/tls_channel.cpp index c905862c6..034976ec4 100644 --- a/src/lib/tls/tls_channel.cpp +++ b/src/lib/tls/tls_channel.cpp @@ -7,7 +7,9 @@ */ #include <botan/tls_channel.h> +#include <botan/tls_policy.h> #include <botan/tls_messages.h> +#include <botan/kdf.h> #include <botan/internal/tls_handshake_state.h> #include <botan/internal/tls_record.h> #include <botan/internal/tls_seq_numbers.h> diff --git a/src/lib/tls/tls_channel.h b/src/lib/tls/tls_channel.h index 61d85756b..2b21b163d 100644 --- a/src/lib/tls/tls_channel.h +++ b/src/lib/tls/tls_channel.h @@ -9,7 +9,6 @@ #ifndef BOTAN_TLS_CHANNEL_H_ #define BOTAN_TLS_CHANNEL_H_ -#include <botan/tls_policy.h> #include <botan/tls_session.h> #include <botan/tls_alert.h> #include <botan/tls_session_manager.h> @@ -29,6 +28,7 @@ class Handshake_State; class Handshake_Message; class Client_Hello; class Server_Hello; +class Policy; /** * Generic interface for TLS endpoint diff --git a/src/lib/tls/tls_ciphersuite.cpp b/src/lib/tls/tls_ciphersuite.cpp index 346d62bea..cef6bb3c7 100644 --- a/src/lib/tls/tls_ciphersuite.cpp +++ b/src/lib/tls/tls_ciphersuite.cpp @@ -10,7 +10,6 @@ #include <botan/block_cipher.h> #include <botan/stream_cipher.h> #include <botan/hash.h> -#include <botan/mac.h> #include <algorithm> namespace Botan { diff --git a/src/lib/tls/tls_client.cpp b/src/lib/tls/tls_client.cpp index d866b5a1f..53d673a5c 100644 --- a/src/lib/tls/tls_client.cpp +++ b/src/lib/tls/tls_client.cpp @@ -13,8 +13,6 @@ #include <iterator> #include <sstream> -#include <botan/hex.h> - namespace Botan { namespace TLS { diff --git a/src/lib/tls/tls_client.h b/src/lib/tls/tls_client.h index b5cb30527..67a086e15 100644 --- a/src/lib/tls/tls_client.h +++ b/src/lib/tls/tls_client.h @@ -10,6 +10,7 @@ #define BOTAN_TLS_CLIENT_H_ #include <botan/tls_channel.h> +#include <botan/tls_policy.h> #include <botan/credentials_manager.h> #include <vector> diff --git a/src/lib/tls/tls_extensions.h b/src/lib/tls/tls_extensions.h index 645d1a4e3..9a92a1135 100644 --- a/src/lib/tls/tls_extensions.h +++ b/src/lib/tls/tls_extensions.h @@ -11,7 +11,6 @@ #define BOTAN_TLS_EXTENSIONS_H_ #include <botan/secmem.h> -#include <botan/tls_magic.h> #include <botan/ocsp.h> #include <vector> #include <string> diff --git a/src/lib/tls/tls_handshake_hash.cpp b/src/lib/tls/tls_handshake_hash.cpp index a3e90ebc5..a48251d06 100644 --- a/src/lib/tls/tls_handshake_hash.cpp +++ b/src/lib/tls/tls_handshake_hash.cpp @@ -6,7 +6,6 @@ */ #include <botan/internal/tls_handshake_hash.h> -#include <botan/tls_exceptn.h> #include <botan/hash.h> namespace Botan { diff --git a/src/lib/tls/tls_handshake_hash.h b/src/lib/tls/tls_handshake_hash.h index ab03f883d..1f80e2c3a 100644 --- a/src/lib/tls/tls_handshake_hash.h +++ b/src/lib/tls/tls_handshake_hash.h @@ -10,7 +10,6 @@ #include <botan/secmem.h> #include <botan/tls_version.h> -#include <botan/tls_magic.h> namespace Botan { diff --git a/src/lib/tls/tls_handshake_io.h b/src/lib/tls/tls_handshake_io.h index 52cb7d90f..8e1a0eca7 100644 --- a/src/lib/tls/tls_handshake_io.h +++ b/src/lib/tls/tls_handshake_io.h @@ -10,7 +10,6 @@ #include <botan/tls_magic.h> #include <botan/tls_version.h> -#include <botan/loadstor.h> #include <functional> #include <vector> #include <deque> diff --git a/src/lib/tls/tls_handshake_state.cpp b/src/lib/tls/tls_handshake_state.cpp index 35973b359..d995802ed 100644 --- a/src/lib/tls/tls_handshake_state.cpp +++ b/src/lib/tls/tls_handshake_state.cpp @@ -9,6 +9,7 @@ #include <botan/internal/tls_record.h> #include <botan/tls_messages.h> #include <botan/tls_callbacks.h> +#include <botan/kdf.h> namespace Botan { diff --git a/src/lib/tls/tls_policy.cpp b/src/lib/tls/tls_policy.cpp index 822b41e5e..863958eaa 100644 --- a/src/lib/tls/tls_policy.cpp +++ b/src/lib/tls/tls_policy.cpp @@ -11,7 +11,6 @@ #include <botan/tls_magic.h> #include <botan/tls_exceptn.h> #include <botan/internal/stl_util.h> -#include <botan/parsing.h> namespace Botan { diff --git a/src/lib/tls/tls_policy.h b/src/lib/tls/tls_policy.h index 1ac3e40f2..ef31dacbe 100644 --- a/src/lib/tls/tls_policy.h +++ b/src/lib/tls/tls_policy.h @@ -11,7 +11,6 @@ #include <botan/tls_version.h> #include <botan/tls_ciphersuite.h> #include <botan/x509cert.h> -#include <botan/dl_group.h> #include <botan/parsing.h> #include <vector> #include <sstream> diff --git a/src/lib/tls/tls_record.h b/src/lib/tls/tls_record.h index 42939b7fd..63989a17e 100644 --- a/src/lib/tls/tls_record.h +++ b/src/lib/tls/tls_record.h @@ -12,8 +12,6 @@ #include <botan/tls_magic.h> #include <botan/tls_version.h> #include <botan/aead.h> -#include <botan/block_cipher.h> -#include <botan/mac.h> #include <vector> #include <chrono> #include <functional> diff --git a/src/lib/tls/tls_server.h b/src/lib/tls/tls_server.h index a7db74f27..eb6e710e1 100644 --- a/src/lib/tls/tls_server.h +++ b/src/lib/tls/tls_server.h @@ -10,10 +10,10 @@ #define BOTAN_TLS_SERVER_H_ #include <botan/tls_channel.h> +#include <botan/tls_policy.h> #include <botan/credentials_manager.h> #include <vector> - namespace Botan { namespace TLS { diff --git a/src/lib/tls/tls_session.cpp b/src/lib/tls/tls_session.cpp index d82c490ab..e73aa4fa6 100644 --- a/src/lib/tls/tls_session.cpp +++ b/src/lib/tls/tls_session.cpp @@ -12,6 +12,7 @@ #include <botan/pem.h> #include <botan/aead.h> #include <botan/mac.h> +#include <botan/rng.h> namespace Botan { diff --git a/src/lib/tls/tls_session_key.cpp b/src/lib/tls/tls_session_key.cpp index 9e8dab86e..469d1d387 100644 --- a/src/lib/tls/tls_session_key.cpp +++ b/src/lib/tls/tls_session_key.cpp @@ -8,6 +8,7 @@ #include <botan/internal/tls_session_key.h> #include <botan/internal/tls_handshake_state.h> #include <botan/tls_messages.h> +#include <botan/kdf.h> namespace Botan { diff --git a/src/lib/tls/tls_session_manager_memory.cpp b/src/lib/tls/tls_session_manager_memory.cpp index f120a4290..5768723d2 100644 --- a/src/lib/tls/tls_session_manager_memory.cpp +++ b/src/lib/tls/tls_session_manager_memory.cpp @@ -7,6 +7,7 @@ #include <botan/tls_session_manager.h> #include <botan/hex.h> +#include <botan/rng.h> #include <chrono> namespace Botan { diff --git a/src/lib/tls/tls_version.cpp b/src/lib/tls/tls_version.cpp index 274cedc11..2b8b68566 100644 --- a/src/lib/tls/tls_version.cpp +++ b/src/lib/tls/tls_version.cpp @@ -7,7 +7,6 @@ #include <botan/tls_version.h> #include <botan/tls_exceptn.h> -#include <botan/parsing.h> namespace Botan { |