diff options
author | Erlang/OTP <[email protected]> | 2015-06-01 12:06:33 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-06-01 12:06:33 +0200 |
commit | 1de75380804938117b198bed4cfa42ce85b8143b (patch) | |
tree | d2a1ae638bee640d2da48116ac22b70fb70448a5 /lib/ssl/src/ssl_cipher.hrl | |
parent | 27e0d318073323dc39f234607e02a56a54b2f80f (diff) | |
parent | 3f600aa0048b6515616774f0a289a88cb66affbe (diff) | |
download | otp-1de75380804938117b198bed4cfa42ce85b8143b.tar.gz otp-1de75380804938117b198bed4cfa42ce85b8143b.tar.bz2 otp-1de75380804938117b198bed4cfa42ce85b8143b.zip |
Merge branch 'hans/ssh/codenomicon_degradation/OTP-12784' into maint-17
* hans/ssh/codenomicon_degradation/OTP-12784:
ssh: update ssh version
ssh: Plain text message returned for invalid version exchange
ssh: Implement keyboard_interactive on server side
ssh: Check e and f parameters in kexdh
ssh: Set max num algoritms in msg_kexinit negotiation
Diffstat (limited to 'lib/ssl/src/ssl_cipher.hrl')
0 files changed, 0 insertions, 0 deletions