I'm not sure if I like this asthetically, but passing around the

entire handshake state in many cases makes things simpler to update,
in that each message type already knows what it needs depending on the
version, params, etc, and this way a) that knowledge doesn't need to
percolate up the the actual client and server handshake code and b)
each message type can be updated for new formats/version without
having to change its callers. Downside is it hides the dependency
information away, and makes it non-obvious what needs to be created
beforehand for each message to work correctly. However this is
(almost) entirely predicated on the handshake message flows, and these
we control with the next expected message scheme, so this should be
fairly safe to do.

This checkin only updates the ones where it was immediately relevant
but for consistency probably all of them should be updated in the same
way.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h
index c7d2d0018..a9bcb8f26 100644
--- a/src/tls/tls_record.h
+++ b/src/tls/tls_record.h
@@ -30,7 +30,7 @@
 
 namespace Botan {
 
-class SessionKeys;
+class Session_Keys;
 
 /**
 * TLS Record Writer
@@ -44,7 +44,7 @@ class BOTAN_DLL Record_Writer
       void alert(Alert_Level level, Alert_Type type);
 
       void activate(const TLS_Cipher_Suite& suite,
-                    const SessionKeys& keys,
+                    const Session_Keys& keys,
                     Connection_Side side);
 
       void set_version(Version_Code version);
@@ -98,7 +98,7 @@ class BOTAN_DLL Record_Reader
                        MemoryVector<byte>& msg);
 
       void activate(const TLS_Cipher_Suite& suite,
-                    const SessionKeys& keys,
+                    const Session_Keys& keys,
                     Connection_Side side);
 
       void set_version(Version_Code version);