Index: lib/ssl/sslenum.c |
diff --git a/lib/ssl/sslenum.c b/lib/ssl/sslenum.c |
index f69aed2df41b623641c02a92c44ea87899027ed3..391bbe4bc90c20ce5a35fa75d3a061c707a4beb1 100644 |
--- a/lib/ssl/sslenum.c |
+++ b/lib/ssl/sslenum.c |
@@ -50,6 +50,8 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
#ifndef NSS_DISABLE_ECC |
TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, |
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, |
+ TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, |
+ TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, |
/* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA must appear before |
* TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA to work around bug 946147. |
*/ |
@@ -66,6 +68,7 @@ const PRUint16 SSL_ImplementedCiphers[] = { |
#endif /* NSS_DISABLE_ECC */ |
TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, |
+ TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, |
TLS_DHE_DSS_WITH_AES_128_GCM_SHA256, |
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, |
TLS_DHE_DSS_WITH_AES_128_CBC_SHA, |