diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-25 18:00:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-28 11:09:55 +0200 |
| commit | e1317dceefe6f7cbd8ed181cf1d90254b743de8d (patch) | |
| tree | 5c70cd1fd0042ad3154898a828c543549c02626e /lib | |
| parent | 504bb40f3530d5890849f1c51f7ce1aba6766784 (diff) | |
| download | otp-e1317dceefe6f7cbd8ed181cf1d90254b743de8d.tar.gz otp-e1317dceefe6f7cbd8ed181cf1d90254b743de8d.tar.bz2 otp-e1317dceefe6f7cbd8ed181cf1d90254b743de8d.zip | |
ssl: Cacha is currently not tested enough to be most prefered.
Diffstat (limited to 'lib')
| -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 f52ee06e71..b2b28f9da6 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, |