diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-01-22 11:14:25 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-01-22 11:14:25 +0100 |
| commit | 737ba8a823a557b5232bb7e00bb3930dd320785d (patch) | |
| tree | eb8d67c8aafc5005391d535429b966e826a7e7a9 /lib/ssl/src/tls_v1.erl | |
| parent | bb64f19a947568a56f719d609fa5915f703a32fb (diff) | |
| parent | 3390468cee84f50b8b553e678608efce6da145ce (diff) | |
| download | otp-737ba8a823a557b5232bb7e00bb3930dd320785d.tar.gz otp-737ba8a823a557b5232bb7e00bb3930dd320785d.tar.bz2 otp-737ba8a823a557b5232bb7e00bb3930dd320785d.zip | |
Merge branch 'ingela/ssl/no-chacha-default-for-now/ERL-538/OTP-14882'
* ingela/ssl/no-chacha-default-for-now/ERL-538/OTP-14882:
ssl: Remove chacha ciphers form default for now
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index deff38fac0..a31ab8d044 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -220,10 +220,6 @@ 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, |