diff options
author | lloyd <lloyd@randombit.net> | 2010-09-15 14:20:38 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2010-09-15 14:20:38 +0000 |
commit | d432647483aa74c97460eb065f2b11fd82fc9177 (patch) | |
tree | 8fae2888ff5c18ab87fbf0c5c63a7e35b5db76a7 /src/ssl | |
parent | 72ba429aa2550d12b13ce321a567601bddf7c665 (diff) |
Hide a number of the internal SSL headers from the user, you can still
see too much but better than before.
Diffstat (limited to 'src/ssl')
-rw-r--r-- | src/ssl/c_kex.cpp | 2 | ||||
-rw-r--r-- | src/ssl/cert_req.cpp | 2 | ||||
-rw-r--r-- | src/ssl/cert_ver.cpp | 2 | ||||
-rw-r--r-- | src/ssl/finished.cpp | 2 | ||||
-rw-r--r-- | src/ssl/hello.cpp | 2 | ||||
-rw-r--r-- | src/ssl/info.txt | 12 | ||||
-rw-r--r-- | src/ssl/rec_wri.cpp | 2 | ||||
-rw-r--r-- | src/ssl/s_kex.cpp | 2 | ||||
-rw-r--r-- | src/ssl/tls_client.cpp | 4 | ||||
-rw-r--r-- | src/ssl/tls_client.h | 6 | ||||
-rw-r--r-- | src/ssl/tls_handshake_hash.cpp (renamed from src/ssl/handshake_hash.cpp) | 2 | ||||
-rw-r--r-- | src/ssl/tls_handshake_hash.h (renamed from src/ssl/handshake_hash.h) | 0 | ||||
-rw-r--r-- | src/ssl/tls_messages.h | 2 | ||||
-rw-r--r-- | src/ssl/tls_record.h | 2 | ||||
-rw-r--r-- | src/ssl/tls_server.cpp | 4 | ||||
-rw-r--r-- | src/ssl/tls_server.h | 6 | ||||
-rw-r--r-- | src/ssl/tls_state.cpp (renamed from src/ssl/handshake_state.cpp) | 2 | ||||
-rw-r--r-- | src/ssl/tls_state.h | 6 |
18 files changed, 32 insertions, 28 deletions
diff --git a/src/ssl/c_kex.cpp b/src/ssl/c_kex.cpp index 2a5dea7b3..3ce4a2f06 100644 --- a/src/ssl/c_kex.cpp +++ b/src/ssl/c_kex.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/internal/tls_reader.h> #include <botan/pubkey.h> #include <botan/dh.h> diff --git a/src/ssl/cert_req.cpp b/src/ssl/cert_req.cpp index 9cd6bd5c1..f30bc2fd7 100644 --- a/src/ssl/cert_req.cpp +++ b/src/ssl/cert_req.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/der_enc.h> #include <botan/ber_dec.h> #include <botan/loadstor.h> diff --git a/src/ssl/cert_ver.cpp b/src/ssl/cert_ver.cpp index 7c6725572..293f643dc 100644 --- a/src/ssl/cert_ver.cpp +++ b/src/ssl/cert_ver.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/internal/tls_reader.h> #include <botan/pubkey.h> #include <botan/rsa.h> diff --git a/src/ssl/finished.cpp b/src/ssl/finished.cpp index 86eee7fe3..d76fbd884 100644 --- a/src/ssl/finished.cpp +++ b/src/ssl/finished.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/prf_tls.h> namespace Botan { diff --git a/src/ssl/hello.cpp b/src/ssl/hello.cpp index 887d13f1f..b0f18d28f 100644 --- a/src/ssl/hello.cpp +++ b/src/ssl/hello.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/internal/tls_reader.h> namespace Botan { diff --git a/src/ssl/info.txt b/src/ssl/info.txt index f0867b3f1..c17700e4f 100644 --- a/src/ssl/info.txt +++ b/src/ssl/info.txt @@ -1,24 +1,24 @@ define SSL_TLS <header:public> -handshake_hash.h socket.h -tls_alerts.h tls_client.h tls_connection.h tls_exceptn.h tls_magic.h -tls_messages.h tls_policy.h tls_record.h tls_server.h tls_session_key.h -tls_state.h tls_suites.h </header:public> <header:internal> +tls_alerts.h +tls_handshake_hash.h +tls_messages.h tls_reader.h +tls_state.h </header:internal> <source> @@ -26,8 +26,7 @@ c_kex.cpp cert_req.cpp cert_ver.cpp finished.cpp -handshake_hash.cpp -handshake_state.cpp +tls_handshake_hash.cpp hello.cpp rec_read.cpp rec_wri.cpp @@ -36,6 +35,7 @@ tls_client.cpp tls_policy.cpp tls_server.cpp tls_session_key.cpp +tls_state.cpp tls_suites.cpp </source> diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp index 607fe7b01..bf0577bd1 100644 --- a/src/ssl/rec_wri.cpp +++ b/src/ssl/rec_wri.cpp @@ -6,7 +6,7 @@ */ #include <botan/tls_record.h> -#include <botan/handshake_hash.h> +#include <botan/internal/tls_handshake_hash.h> #include <botan/lookup.h> #include <botan/loadstor.h> #include <botan/libstate.h> diff --git a/src/ssl/s_kex.cpp b/src/ssl/s_kex.cpp index 6e4749491..b04cad3ea 100644 --- a/src/ssl/s_kex.cpp +++ b/src/ssl/s_kex.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/pubkey.h> #include <botan/dh.h> #include <botan/rsa.h> diff --git a/src/ssl/tls_client.cpp b/src/ssl/tls_client.cpp index 79ca842d9..323fb6bd3 100644 --- a/src/ssl/tls_client.cpp +++ b/src/ssl/tls_client.cpp @@ -6,8 +6,8 @@ */ #include <botan/tls_client.h> -#include <botan/tls_alerts.h> -#include <botan/tls_state.h> +#include <botan/internal/tls_alerts.h> +#include <botan/internal/tls_state.h> #include <botan/loadstor.h> #include <botan/rsa.h> #include <botan/dsa.h> diff --git a/src/ssl/tls_client.h b/src/ssl/tls_client.h index c9ed3ca37..14b3b6451 100644 --- a/src/ssl/tls_client.h +++ b/src/ssl/tls_client.h @@ -9,7 +9,9 @@ #define BOTAN_TLS_CLIENT_H__ #include <botan/tls_connection.h> -#include <botan/tls_state.h> +#include <botan/tls_policy.h> +#include <botan/tls_record.h> +#include <botan/socket.h> #include <vector> #include <string> @@ -69,7 +71,7 @@ class BOTAN_DLL TLS_Client : public TLS_Connection std::vector<X509_Certificate> certs, peer_certs; std::vector<Private_Key*> keys; - Handshake_State* state; + class Handshake_State* state; SecureVector<byte> session_id; SecureQueue read_buf; std::string peer_id; diff --git a/src/ssl/handshake_hash.cpp b/src/ssl/tls_handshake_hash.cpp index a9e1d8e13..93442cad1 100644 --- a/src/ssl/handshake_hash.cpp +++ b/src/ssl/tls_handshake_hash.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/handshake_hash.h> +#include <botan/internal/tls_handshake_hash.h> #include <botan/md5.h> #include <botan/sha160.h> #include <memory> diff --git a/src/ssl/handshake_hash.h b/src/ssl/tls_handshake_hash.h index 4c145c6c6..4c145c6c6 100644 --- a/src/ssl/handshake_hash.h +++ b/src/ssl/tls_handshake_hash.h diff --git a/src/ssl/tls_messages.h b/src/ssl/tls_messages.h index 20aa9b930..63c4acd0d 100644 --- a/src/ssl/tls_messages.h +++ b/src/ssl/tls_messages.h @@ -9,7 +9,7 @@ #define BOTAN_TLS_MESSAGES_H__ #include <botan/tls_record.h> -#include <botan/handshake_hash.h> +#include <botan/internal/tls_handshake_hash.h> #include <botan/tls_policy.h> #include <botan/bigint.h> #include <botan/pkcs8.h> diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h index 863e2c801..7ea7f3cc8 100644 --- a/src/ssl/tls_record.h +++ b/src/ssl/tls_record.h @@ -9,8 +9,8 @@ #define BOTAN_TLS_RECORDS_H__ #include <botan/tls_session_key.h> -#include <botan/socket.h> #include <botan/tls_suites.h> +#include <botan/socket.h> #include <botan/pipe.h> #include <botan/secqueue.h> #include <vector> diff --git a/src/ssl/tls_server.cpp b/src/ssl/tls_server.cpp index 8d9cc1b43..33210dccb 100644 --- a/src/ssl/tls_server.cpp +++ b/src/ssl/tls_server.cpp @@ -6,8 +6,8 @@ */ #include <botan/tls_server.h> -#include <botan/tls_alerts.h> -#include <botan/tls_state.h> +#include <botan/internal/tls_alerts.h> +#include <botan/internal/tls_state.h> #include <botan/loadstor.h> #include <botan/rsa.h> #include <botan/dh.h> diff --git a/src/ssl/tls_server.h b/src/ssl/tls_server.h index 673f16580..13f8f46df 100644 --- a/src/ssl/tls_server.h +++ b/src/ssl/tls_server.h @@ -9,7 +9,9 @@ #define BOTAN_TLS_SERVER_H__ #include <botan/tls_connection.h> -#include <botan/tls_state.h> +#include <botan/tls_record.h> +#include <botan/tls_policy.h> +#include <botan/socket.h> #include <vector> namespace Botan { @@ -62,7 +64,7 @@ class BOTAN_DLL TLS_Server : public TLS_Connection std::vector<X509_Certificate> cert_chain, peer_certs; Private_Key* private_key; - Handshake_State* state; + class Handshake_State* state; SecureVector<byte> session_id; SecureQueue read_buf; std::string peer_id; diff --git a/src/ssl/handshake_state.cpp b/src/ssl/tls_state.cpp index 373d4b57c..6aaf5e201 100644 --- a/src/ssl/handshake_state.cpp +++ b/src/ssl/tls_state.cpp @@ -5,7 +5,7 @@ * Released under the terms of the Botan license */ -#include <botan/tls_state.h> +#include <botan/internal/tls_state.h> namespace Botan { diff --git a/src/ssl/tls_state.h b/src/ssl/tls_state.h index 1472271e3..e2728198f 100644 --- a/src/ssl/tls_state.h +++ b/src/ssl/tls_state.h @@ -1,5 +1,5 @@ /* -* TLS Handshaking +* TLS Handshake State * (C) 2004-2006 Jack Lloyd * * Released under the terms of the Botan license @@ -8,7 +8,7 @@ #ifndef BOTAN_TLS_HANDSHAKE_H__ #define BOTAN_TLS_HANDSHAKE_H__ -#include <botan/tls_messages.h> +#include <botan/internal/tls_messages.h> #include <botan/secqueue.h> namespace Botan { @@ -16,7 +16,7 @@ namespace Botan { /** * SSL/TLS Handshake State */ -class BOTAN_DLL Handshake_State +class Handshake_State { public: Client_Hello* client_hello; |