diff options
| author | Hans Nilsson <[email protected]> | 2018-05-08 11:44:42 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-08 11:44:42 +0200 |
| commit | 91235f1aa793bb9f954c2408c859ed199839343b (patch) | |
| tree | 211abd9148a06c4b2f759c83ea2be5979e386bb3 /lib/ssh/src/ssh_connection_handler.erl | |
| parent | 80c5f0f27b84173b83aaf0ecfb8f839660b918a6 (diff) | |
| parent | 143569f30151422b6a5b0fda662061d41ff82d74 (diff) | |
| download | otp-91235f1aa793bb9f954c2408c859ed199839343b.tar.gz otp-91235f1aa793bb9f954c2408c859ed199839343b.tar.bz2 otp-91235f1aa793bb9f954c2408c859ed199839343b.zip | |
Merge branch 'maint'
* maint:
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
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 2 |
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 b21c0337ad..dfdad769ed 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -545,7 +545,7 @@ role({_,Role}) -> Role; role({_,Role,_}) -> Role. -spec renegotiation(state_name()) -> boolean(). -renegotiation({_,_,ReNeg}) -> ReNeg == renegotiation; +renegotiation({_,_,ReNeg}) -> ReNeg == renegotiate; renegotiation(_) -> false. |