diff options
| author | Hans Nilsson <[email protected]> | 2017-01-31 16:51:54 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-01-31 16:51:54 +0100 |
| commit | 21d21786abdaae2ae0a601baf5102412399d7af6 (patch) | |
| tree | 1a684c0395ee28b6911e605d80913dbed44cf36f /lib/ssh/src/ssh_connection_handler.erl | |
| parent | 82c885e37f5886da35ae1ba0338702c89df75623 (diff) | |
| parent | 80a162cdf59f6a3826fba0cc0d3b861451a6b102 (diff) | |
| download | otp-21d21786abdaae2ae0a601baf5102412399d7af6.tar.gz otp-21d21786abdaae2ae0a601baf5102412399d7af6.tar.bz2 otp-21d21786abdaae2ae0a601baf5102412399d7af6.zip | |
Merge branch 'hans/ssh/speed_dh_keygen/OTP-14169' into maint
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 8718e92fa2..4496c657c3 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -609,13 +609,15 @@ handle_event(_, #ssh_msg_kexdh_reply{} = Msg, {key_exchange,client,ReNeg}, D) -> %%%---- diffie-hellman group exchange handle_event(_, #ssh_msg_kex_dh_gex_request{} = Msg, {key_exchange,server,ReNeg}, D) -> - {ok, GexGroup, Ssh} = ssh_transport:handle_kex_dh_gex_request(Msg, D#data.ssh_params), + {ok, GexGroup, Ssh1} = ssh_transport:handle_kex_dh_gex_request(Msg, D#data.ssh_params), send_bytes(GexGroup, D), + Ssh = ssh_transport:parallell_gen_key(Ssh1), {next_state, {key_exchange_dh_gex_init,server,ReNeg}, D#data{ssh_params=Ssh}}; handle_event(_, #ssh_msg_kex_dh_gex_request_old{} = Msg, {key_exchange,server,ReNeg}, D) -> - {ok, GexGroup, Ssh} = ssh_transport:handle_kex_dh_gex_request(Msg, D#data.ssh_params), + {ok, GexGroup, Ssh1} = ssh_transport:handle_kex_dh_gex_request(Msg, D#data.ssh_params), send_bytes(GexGroup, D), + Ssh = ssh_transport:parallell_gen_key(Ssh1), {next_state, {key_exchange_dh_gex_init,server,ReNeg}, D#data{ssh_params=Ssh}}; handle_event(_, #ssh_msg_kex_dh_gex_group{} = Msg, {key_exchange,client,ReNeg}, D) -> |