Add an abstraction for reading handshake messages (as DTLS handles it

quite differently).

Avoid using a queue for reading certificates.

Hide the version code in the handshake state with a getter and setter.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tls/tls_session_key.cpp b/src/tls/tls_session_key.cpp
index 83ac7540b..edd0617bc 100644
--- a/src/tls/tls_session_key.cpp
+++ b/src/tls/tls_session_key.cpp
@@ -47,7 +47,7 @@ Session_Keys::Session_Keys(Handshake_State* state,
       {
       SecureVector<byte> salt;
 
-      if(state->version != Protocol_Version::SSL_V3)
+      if(state->version() != Protocol_Version::SSL_V3)
          salt += std::make_pair(MASTER_SECRET_MAGIC, sizeof(MASTER_SECRET_MAGIC));
 
       salt += state->client_hello->random();
@@ -57,7 +57,7 @@ Session_Keys::Session_Keys(Handshake_State* state,
       }
 
    SecureVector<byte> salt;
-   if(state->version != Protocol_Version::SSL_V3)
+   if(state->version() != Protocol_Version::SSL_V3)
       salt += std::make_pair(KEY_GEN_MAGIC, sizeof(KEY_GEN_MAGIC));
    salt += state->server_hello->random();
    salt += state->client_hello->random();