aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_v1.erl
diff options
context:
space:
mode:
authorAndreas Schultz <[email protected]>2014-07-13 11:27:25 +0200
committerAndreas Schultz <[email protected]>2014-09-03 15:26:00 +0200
commit7603a4029514a644c8323028b06acdc33e45b286 (patch)
treee99b80667251727dd71bf87124128e73d6e8b4cc /lib/ssl/src/tls_v1.erl
parentfb9d36c2c7c1bd4760d0be2801b9c2852d3502bf (diff)
downloadotp-7603a4029514a644c8323028b06acdc33e45b286.tar.gz
otp-7603a4029514a644c8323028b06acdc33e45b286.tar.bz2
otp-7603a4029514a644c8323028b06acdc33e45b286.zip
ssl: add draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
-rw-r--r--lib/ssl/src/tls_v1.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl
index 19b8512cdb..c4114278a4 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -221,6 +221,9 @@ suites(Minor) when Minor == 1; Minor == 2 ->
];
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_RSA_WITH_AES_256_GCM_SHA384,
?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
@@ -230,6 +233,7 @@ suites(3) ->
?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
+ ?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,