aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-11-04 15:47:03 +0100
committerIngela Anderton Andin <[email protected]>2014-11-04 15:47:03 +0100
commit509163307c31bf4f98a638b47ee03a5b99eb2c73 (patch)
tree1fb06023969f45480e3350a59c05c88bc4244c04 /lib/ssh/src
parent487c3858450d27e6838eed19e55c21641d101908 (diff)
parenta40c6261d97a63c212235f568d91ddef34e44cb6 (diff)
downloadotp-509163307c31bf4f98a638b47ee03a5b99eb2c73.tar.gz
otp-509163307c31bf4f98a638b47ee03a5b99eb2c73.tar.bz2
otp-509163307c31bf4f98a638b47ee03a5b99eb2c73.zip
Merge branch 'ia/ssh/rekeying-typo/OTP-12277' into maint
* ia/ssh/rekeying-typo/OTP-12277: ssh: Correct typo of renegotiate that could cause rekeying to fail
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index fa107be1b1..8b7c4a5f80 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -624,7 +624,7 @@ handle_event(renegotiate, connected, #state{ssh_params = Ssh0}
renegotiate = true})};
handle_event(renegotiate, StateName, State) ->
- timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiatie]),
+ timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiate]),
%% Allready in keyexcahange so ignore
{next_state, StateName, State};