diff options
author | Ingela Anderton Andin <[email protected]> | 2017-08-09 16:14:13 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-08-10 09:52:55 +0200 |
commit | e0765bd47591624ac715e7023a0b0d292c1b12e8 (patch) | |
tree | a2a7411374c553583e3688af835e611795c71d35 /lib/ssl/src/ssl_cipher.erl | |
parent | 8db869c9aba5d063352732ce0b19731629f6ab0b (diff) | |
download | otp-e0765bd47591624ac715e7023a0b0d292c1b12e8.tar.gz otp-e0765bd47591624ac715e7023a0b0d292c1b12e8.tar.bz2 otp-e0765bd47591624ac715e7023a0b0d292c1b12e8.zip |
ssl: Correct cipher suite handling
This is mainly fixing the test suites so that they test the intended cipher
suites, issue reported in ERL-460.
Also ssl_cipher:anonymous_suites was corrected for DTLS.
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
-rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index bd60197c88..50c5f0d755 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -335,7 +335,9 @@ all_suites(Version) -> anonymous_suites({3, N}) -> anonymous_suites(N); - +anonymous_suites({254, _} = Version) -> + anonymous_suites(dtls_v1:corresponding_tls_version(Version)) + -- [?TLS_DH_anon_WITH_RC4_128_MD5]; anonymous_suites(N) when N >= 3 -> [?TLS_DH_anon_WITH_AES_128_GCM_SHA256, |