Remove Channel::read_handshake. Have the server set expected next msg

in new_handshake_state.

1 files changed, 4 insertions, 18 deletions

diff --git a/src/tls/tls_server.cpp b/src/tls/tls_server.cpp
index 9c6250273..25716c144 100644
--- a/src/tls/tls_server.cpp
+++ b/src/tls/tls_server.cpp
@@ -207,7 +207,9 @@ Server::Server(std::function<void (const byte[], size_t)> output_fn,
 
 Handshake_State* Server::new_handshake_state()
    {
-   return new Handshake_State(new Stream_Handshake_IO(m_writer));
+   Handshake_State* state = new Handshake_State(new Stream_Handshake_IO(m_writer));
+   state->set_expected_next(CLIENT_HELLO);
+   return state;
    }
 
 /*
@@ -219,9 +221,8 @@ void Server::renegotiate(bool force_full_renegotiation)
       return; // currently in handshake
 
    m_state.reset(new_handshake_state());
-
    m_state->allow_session_resumption = !force_full_renegotiation;
-   m_state->set_expected_next(CLIENT_HELLO);
+
    Hello_Request hello_req(m_state->handshake_io());
    }
 
@@ -235,21 +236,6 @@ void Server::alert_notify(const Alert& alert)
    }
 
 /*
-* Split up and process handshake messages
-*/
-void Server::read_handshake(byte rec_type,
-                            const std::vector<byte>& rec_buf)
-   {
-   if(rec_type == HANDSHAKE && !m_state)
-      {
-      m_state.reset(new_handshake_state());
-      m_state->set_expected_next(CLIENT_HELLO);
-      }
-
-   Channel::read_handshake(rec_type, rec_buf);
-   }
-
-/*
 * Process a handshake message
 */
 void Server::process_handshake_msg(Handshake_Type type,