aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2010-01-12 14:59:08 +0100
committerDan Gudmundsson <[email protected]>2010-01-12 14:59:08 +0100
commit5c0e1b1642002cfd906ac5a03b9814ae0836d8c1 (patch)
tree8b769b0df117dba0a4ebc626cf321531617ff4e2 /lib/ssl
parentc9c70aa3cc4e2087cf0da4c4ba36f3dd4e4e4627 (diff)
downloadotp-5c0e1b1642002cfd906ac5a03b9814ae0836d8c1.tar.gz
otp-5c0e1b1642002cfd906ac5a03b9814ae0836d8c1.tar.bz2
otp-5c0e1b1642002cfd906ac5a03b9814ae0836d8c1.zip
Minor code cleanup
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl_connection.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index c292fd70c7..8e563f36f9 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1115,13 +1115,12 @@ do_server_hello(Type, #state{negotiated_version = Version,
case ssl_handshake:master_secret(Version, Session,
ConnectionStates0, server) of
{_, ConnectionStates1} ->
- {ConnectionStates, Hashes} =
- finalize_server_handshake(State#state{connection_states=ConnectionStates1, session = Session}),
- NewState =
- State#state{connection_states = ConnectionStates,
- session = Session,
- tls_handshake_hashes = Hashes},
- {next_state, abbreviated, next_record(NewState)};
+ State1 = State#state{connection_states=ConnectionStates1,
+ session = Session},
+ {ConnectionStates, Hashes} = finalize_server_handshake(State1),
+ Resumed = State1#state{connection_states = ConnectionStates,
+ tls_handshake_hashes = Hashes},
+ {next_state, abbreviated, next_record(Resumed)};
#alert{} = Alert ->
handle_own_alert(Alert, Version, hello, State),
{stop, normal, State}