diff options
| author | Hans Nilsson <[email protected]> | 2016-10-18 11:06:41 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-10-18 11:06:41 +0200 |
| commit | 1550204bed17ecdcc59a53332bcdfa2ba246944a (patch) | |
| tree | de6657101f4ef38f31ea5c7639e6b05516f89380 /lib/ssh/src | |
| parent | a6d14916e17dfff43277a0d7f160e1c46b67daa0 (diff) | |
| parent | 926391fbb8761d5833b3a6f5c9e523fcda373c6d (diff) | |
| download | otp-1550204bed17ecdcc59a53332bcdfa2ba246944a.tar.gz otp-1550204bed17ecdcc59a53332bcdfa2ba246944a.tar.bz2 otp-1550204bed17ecdcc59a53332bcdfa2ba246944a.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index ced049f0d0..dd414894d4 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -671,8 +671,9 @@ handle_event(_, #ssh_msg_newkeys{} = Msg, {new_keys,Role,init}, D) -> {next_state, {service_request,Role}, D#data{ssh_params=Ssh}}; %% Subsequent key exchange rounds (renegotiation): -handle_event(_, #ssh_msg_newkeys{}, {new_keys,Role,renegotiate}, D) -> - {next_state, {connected,Role}, D}; +handle_event(_, #ssh_msg_newkeys{} = Msg, {new_keys,Role,renegotiate}, D) -> + {ok, Ssh} = ssh_transport:handle_new_keys(Msg, D#data.ssh_params), + {next_state, {connected,Role}, D#data{ssh_params=Ssh}}; %%% ######## {service_request, client|server} |