diff options
| -rw-r--r-- | src/tls/info.txt | 4 | ||||
| -rw-r--r-- | src/tls/tls_ciphersuite.cpp (renamed from src/tls/tls_suites.cpp) | 3 | ||||
| -rw-r--r-- | src/tls/tls_ciphersuite.h (renamed from src/tls/tls_suites.h) | 9 | ||||
| -rw-r--r-- | src/tls/tls_messages.h | 2 | ||||
| -rw-r--r-- | src/tls/tls_policy.cpp | 2 | ||||
| -rw-r--r-- | src/tls/tls_record.h | 3 | ||||
| -rw-r--r-- | src/tls/tls_session.h | 2 | ||||
| -rw-r--r-- | src/tls/tls_session_key.h | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/src/tls/info.txt b/src/tls/info.txt index 599455aeb..0c52e14f0 100644 --- a/src/tls/info.txt +++ b/src/tls/info.txt @@ -17,7 +17,7 @@ tls_record.h tls_server.h tls_session.h tls_session_manager.h -tls_suites.h +tls_ciphersuite.h tls_version.h </header:public> @@ -52,7 +52,7 @@ tls_server.cpp tls_session.cpp tls_session_key.cpp tls_session_manager.cpp -tls_suites.cpp +tls_ciphersuite.cpp tls_version.cpp </source> diff --git a/src/tls/tls_suites.cpp b/src/tls/tls_ciphersuite.cpp index 8a3bba3a9..ffd1c7810 100644 --- a/src/tls/tls_suites.cpp +++ b/src/tls/tls_ciphersuite.cpp @@ -5,7 +5,8 @@ * Released under the terms of the Botan license */ -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> +#include <botan/tls_magic.h> #include <botan/parsing.h> #include <sstream> #include <stdexcept> diff --git a/src/tls/tls_suites.h b/src/tls/tls_ciphersuite.h index 0778a4eda..704a70cf4 100644 --- a/src/tls/tls_suites.h +++ b/src/tls/tls_ciphersuite.h @@ -9,7 +9,6 @@ #define BOTAN_TLS_CIPHER_SUITES_H__ #include <botan/types.h> -#include <botan/tls_magic.h> #include <string> namespace Botan { @@ -40,10 +39,10 @@ class BOTAN_DLL Ciphersuite Ciphersuite() : m_cipher_keylen(0) {} Ciphersuite(const std::string& sig_algo, - const std::string& kex_algo, - const std::string& mac_algo, - const std::string& cipher_algo, - size_t cipher_algo_keylen); + const std::string& kex_algo, + const std::string& mac_algo, + const std::string& cipher_algo, + size_t cipher_algo_keylen); private: std::string m_sig_algo, m_kex_algo, m_mac_algo, m_cipher_algo; size_t m_cipher_keylen; diff --git a/src/tls/tls_messages.h b/src/tls/tls_messages.h index 8391e185f..7eb67f3b6 100644 --- a/src/tls/tls_messages.h +++ b/src/tls/tls_messages.h @@ -12,7 +12,7 @@ #include <botan/tls_session.h> #include <botan/tls_policy.h> #include <botan/tls_magic.h> -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> #include <botan/bigint.h> #include <botan/pkcs8.h> #include <botan/x509cert.h> diff --git a/src/tls/tls_policy.cpp b/src/tls/tls_policy.cpp index b671830ea..38dd21a55 100644 --- a/src/tls/tls_policy.cpp +++ b/src/tls/tls_policy.cpp @@ -6,7 +6,7 @@ */ #include <botan/tls_policy.h> -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> #include <botan/tls_exceptn.h> #include <botan/internal/stl_util.h> diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h index 991243af5..41e1c6372 100644 --- a/src/tls/tls_record.h +++ b/src/tls/tls_record.h @@ -8,7 +8,8 @@ #ifndef BOTAN_TLS_RECORDS_H__ #define BOTAN_TLS_RECORDS_H__ -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> +#include <botan/tls_magic.h> #include <botan/tls_version.h> #include <botan/pipe.h> #include <botan/mac.h> diff --git a/src/tls/tls_session.h b/src/tls/tls_session.h index 297ff5f96..f8b94133b 100644 --- a/src/tls/tls_session.h +++ b/src/tls/tls_session.h @@ -10,7 +10,7 @@ #include <botan/x509cert.h> #include <botan/tls_version.h> -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> #include <botan/tls_magic.h> #include <botan/secmem.h> diff --git a/src/tls/tls_session_key.h b/src/tls/tls_session_key.h index 736475be6..25de56aea 100644 --- a/src/tls/tls_session_key.h +++ b/src/tls/tls_session_key.h @@ -8,7 +8,7 @@ #ifndef BOTAN_TLS_SESSION_KEYS_H__ #define BOTAN_TLS_SESSION_KEYS_H__ -#include <botan/tls_suites.h> +#include <botan/tls_ciphersuite.h> #include <botan/tls_exceptn.h> #include <botan/symkey.h> |