diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-28 11:13:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-28 11:13:14 +0200 |
| commit | e069941a410f61cf6ba981ef6ae10e467b9c616c (patch) | |
| tree | 98d4372f3f3759c0050ce883b4675e0112fbcc57 | |
| parent | 9f7cd3093a1698c9bf2da569362d8071ec5a7ca6 (diff) | |
| parent | e1317dceefe6f7cbd8ed181cf1d90254b743de8d (diff) | |
| download | otp-e069941a410f61cf6ba981ef6ae10e467b9c616c.tar.gz otp-e069941a410f61cf6ba981ef6ae10e467b9c616c.tar.bz2 otp-e069941a410f61cf6ba981ef6ae10e467b9c616c.zip | |
Merge branch 'ingela/ssl/cacha-default/OTP-14382'
* ingela/ssl/cacha-default/OTP-14382:
ssl: Cacha is currently not tested enough to be most prefered.
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 5a46b1770d..bc487fdca4 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -221,11 +221,7 @@ suites(Minor) when Minor == 1; Minor == 2 -> ?TLS_RSA_WITH_3DES_EDE_CBC_SHA ]; suites(3) -> - [ - ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, - ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, - - ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, + [?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, @@ -234,7 +230,10 @@ suites(3) -> ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384, ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384, + ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, + ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, + ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384, ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256, |