diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-11 09:59:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-11 09:59:29 +0200 |
| commit | 99f0de1edcf0d49117fe5699230edf5f2d45c39a (patch) | |
| tree | f09e95254b53aa916b725302738c5af9af3216f6 /lib/ssl/src | |
| parent | 49918dd747d6d949d72ca51f1323b04abd2afba5 (diff) | |
| parent | e0765bd47591624ac715e7023a0b0d292c1b12e8 (diff) | |
| download | otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.tar.gz otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.tar.bz2 otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.zip | |
Merge branch 'ingela/ssl/cert-handling' into maint
* ingela/ssl/cert-handling:
ssl: Correct cipher suite handling
ssl: Modernize DSA cert chain generation
ssl: Clean
ssl: Remove test of OpenSSL
ssl: Use new cert generation
Diffstat (limited to 'lib/ssl/src')
| -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, |