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, 5 insertions, 8 deletions

diff --git a/src/tls/tls_session_key.h b/src/tls/tls_session_key.h
index a698dfcfc..8ba3d2b72 100644
--- a/src/tls/tls_session_key.h
+++ b/src/tls/tls_session_key.h
@@ -17,7 +17,7 @@ namespace Botan {
 /**
 * TLS Session Keys
 */
-class SessionKeys
+class Session_Keys
    {
    public:
       SymmetricKey client_cipher_key() const { return c_cipher; }
@@ -31,14 +31,11 @@ class SessionKeys
 
       const SecureVector<byte>& master_secret() const { return master_sec; }
 
-      SessionKeys() {}
+      Session_Keys() {}
 
-      SessionKeys(const TLS_Cipher_Suite& suite,
-                  Version_Code version,
-                  const MemoryRegion<byte>& pre_master,
-                  const MemoryRegion<byte>& client_random,
-                  const MemoryRegion<byte>& server_random,
-                  bool resuming = false);
+      Session_Keys(class TLS_Handshake_State* state,
+                   const MemoryRegion<byte>& pre_master,
+                   bool resuming);
 
    private:
       SecureVector<byte> master_sec;