aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_connection_handler.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-05-08 11:43:35 +0200
committerHans Nilsson <[email protected]>2018-05-08 11:43:35 +0200
commit143569f30151422b6a5b0fda662061d41ff82d74 (patch)
tree25786e520e3c1063946de6c291971dc85da1a00c /lib/ssh/src/ssh_connection_handler.erl
parent26eea10dda1f316045e58e30a126feafe1843d3a (diff)
parent40ab3958644be3fc14682c54233514fdf880386a (diff)
downloadotp-143569f30151422b6a5b0fda662061d41ff82d74.tar.gz
otp-143569f30151422b6a5b0fda662061d41ff82d74.tar.bz2
otp-143569f30151422b6a5b0fda662061d41ff82d74.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
-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 ad23d82ea8..36152bacf7 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -522,7 +522,7 @@ role({_,Role}) -> Role;
role({_,Role,_}) -> Role.
-spec renegotiation(state_name()) -> boolean().
-renegotiation({_,_,ReNeg}) -> ReNeg == renegotiation;
+renegotiation({_,_,ReNeg}) -> ReNeg == renegotiate;
renegotiation(_) -> false.