From f5cc8e99d4b717296880d6959bf2510ad056ae9b Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 13 May 2014 09:53:59 +0200 Subject: ssl: Only allow one next protocol handsake message --- lib/ssl/src/ssl_connection.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 1eda926bcb..f681204de6 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -602,7 +602,7 @@ cipher(#finished{verify_data = Data} = Finished, cipher(#next_protocol{selected_protocol = SelectedProtocol}, #state{role = server, expecting_next_protocol_negotiation = true} = State0, Connection) -> {Record, State} = Connection:next_record(State0#state{next_protocol = SelectedProtocol}), - Connection:next_state(cipher, cipher, Record, State); + Connection:next_state(cipher, cipher, Record, State#state{expecting_next_protocol_negotiation = false}); cipher(timeout, State, _) -> {next_state, cipher, State, hibernate}; -- cgit v1.2.3 From a56077709c1a6a25e19c7b5efc5fcfaa223a36c1 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 14 May 2014 09:41:55 +0200 Subject: ssl: Fix dialyzer spec --- lib/ssl/src/ssl_socket.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ssl/src/ssl_socket.erl b/lib/ssl/src/ssl_socket.erl index e42d637301..8532788ffd 100644 --- a/lib/ssl/src/ssl_socket.erl +++ b/lib/ssl/src/ssl_socket.erl @@ -162,10 +162,11 @@ handle_cast(_, State)-> {noreply, State}. %%-------------------------------------------------------------------- --spec handle_info(msg(), #state{}) -> {noreply, #state{}}. +-spec handle_info(msg(), #state{}) -> {stop, reason(), #state{}}. %% Possible return values not used now. +%% {noreply, #state{}}. %% |{noreply, #state{}, timeout()} | -%% {stop, reason(), #state{}}. +%% %% %% Description: Handling all non call/cast messages %%------------------------------------------------------------------- -- cgit v1.2.3