aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-09-09 17:09:45 +0000
committerlloyd <[email protected]>2012-09-09 17:09:45 +0000
commitece468628b08d83c71c524d0a72a47d1e8ffa59c (patch)
tree69a93492d4b761f8ae853bd40be689bd3684c1ee
parent8af91eb14bbf2f9b7c7ba8b59a78aeff1be87352 (diff)
Clean up includes
-rw-r--r--src/tls/tls_handshake_state.h3
-rw-r--r--src/tls/tls_record.cpp2
-rw-r--r--src/tls/tls_record.h4
-rw-r--r--src/tls/tls_session_key.h2
4 files changed, 5 insertions, 6 deletions
diff --git a/src/tls/tls_handshake_state.h b/src/tls/tls_handshake_state.h
index 0ada6cfd7..319c9c288 100644
--- a/src/tls/tls_handshake_state.h
+++ b/src/tls/tls_handshake_state.h
@@ -11,11 +11,12 @@
#include <botan/internal/tls_handshake_hash.h>
#include <botan/internal/tls_handshake_io.h>
#include <botan/internal/tls_session_key.h>
+#include <botan/tls_ciphersuite.h>
+#include <botan/tls_exceptn.h>
#include <botan/tls_handshake_msg.h>
#include <botan/pk_keys.h>
#include <botan/pubkey.h>
#include <functional>
-#include <utility>
#include <memory>
namespace Botan {
diff --git a/src/tls/tls_record.cpp b/src/tls/tls_record.cpp
index f4a033f48..dc3b68c8e 100644
--- a/src/tls/tls_record.cpp
+++ b/src/tls/tls_record.cpp
@@ -6,6 +6,8 @@
*/
#include <botan/internal/tls_record.h>
+#include <botan/tls_ciphersuite.h>
+#include <botan/tls_exceptn.h>
#include <botan/libstate.h>
#include <botan/loadstor.h>
#include <botan/internal/tls_session_key.h>
diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h
index df4858fb9..09e247032 100644
--- a/src/tls/tls_record.h
+++ b/src/tls/tls_record.h
@@ -8,21 +8,19 @@
#ifndef BOTAN_TLS_RECORDS_H__
#define BOTAN_TLS_RECORDS_H__
-#include <botan/tls_ciphersuite.h>
-#include <botan/tls_alert.h>
#include <botan/tls_magic.h>
#include <botan/tls_version.h>
#include <botan/block_cipher.h>
#include <botan/stream_cipher.h>
#include <botan/mac.h>
#include <vector>
-#include <functional>
#include <memory>
namespace Botan {
namespace TLS {
+class Ciphersuite;
class Session_Keys;
/**
diff --git a/src/tls/tls_session_key.h b/src/tls/tls_session_key.h
index b67606a08..d62e3400d 100644
--- a/src/tls/tls_session_key.h
+++ b/src/tls/tls_session_key.h
@@ -8,8 +8,6 @@
#ifndef BOTAN_TLS_SESSION_KEYS_H__
#define BOTAN_TLS_SESSION_KEYS_H__
-#include <botan/tls_ciphersuite.h>
-#include <botan/tls_exceptn.h>
#include <botan/symkey.h>
namespace Botan {