aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2011-12-27 20:27:23 +0000
committerlloyd <[email protected]>2011-12-27 20:27:23 +0000
commit1bfd053969280ee6228f5579b2e2f1ff3cbcf0a5 (patch)
treee089c317fea78a60195a6858a1932878a9c0f1a4
parentfbe23e197b5c80b162234aa1cf5723037b22bdc2 (diff)
Actually send the right info in a resumed session server hello
-rw-r--r--src/tls/tls_server.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/tls/tls_server.cpp b/src/tls/tls_server.cpp
index ac16aa42e..59e7286ac 100644
--- a/src/tls/tls_server.cpp
+++ b/src/tls/tls_server.cpp
@@ -149,16 +149,13 @@ void TLS_Server::process_handshake_msg(Handshake_Type type,
{
// resume session
- // FIXME: should only send the resumed ciphersuite
- // (eg even if policy object changed)
state->server_hello = new Server_Hello(
rng,
writer,
- policy,
- cert_chain,
- *(state->client_hello),
- state->client_hello->session_id(),
- state->version,
+ session_info.session_id,
+ session_info.ciphersuite,
+ session_info.compression_method,
+ Version_Code(session_info.version),
state->hash);
state->suite = CipherSuite(state->server_hello->ciphersuite());