nss: add chacha20-poly1305 cipher suites if supported by NSS

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bba03976d755f59c095d44915a58929e73576347..4633f089a287d399f9573f4f603e898c216c3a31 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -8,7 +8,7 @@ Curl and libcurl 7.51.0
 
 This release includes the following changes:
 
- o
+ o nss: additional cipher suites are now accepted by CURLOPT_SSL_CIPHER_LIST
 
 This release includes the following bugfixes:
 

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 1d006ea0a08498cac0366d975b8e21ffed0eb4cf..8c945548a311bf862cd42f83d326422b3672b4df 100644 (file)
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -189,6 +189,15 @@ static const cipher_s cipherlist[] = {
   {"ecdhe_ecdsa_aes_256_gcm_sha_384", TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384},
   {"ecdhe_rsa_aes_256_gcm_sha_384",   TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384},
 #endif
+#ifdef TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+  /* chacha20-poly1305 cipher suites */
+ {"ecdhe_rsa_chacha20_poly1305_sha_256",
+     TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256},
+ {"ecdhe_ecdsa_chacha20_poly1305_sha_256",
+     TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256},
+ {"dhe_rsa_chacha20_poly1305_sha_256",
+     TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256},
+#endif
 };
 
 static const char* pem_library = "libnsspem.so";