aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Dudka <kdudka@redhat.com>2016-09-19 17:45:53 +0200
committerKamil Dudka <kdudka@redhat.com>2016-09-22 10:20:12 +0200
commitd1f1c857ad559eafef9373621d30174c046261ef (patch)
treec803afb7c21862e7ef347b2e507222485b01e718
parent049aa9254687f6738642bd73da9bf96d8af2a833 (diff)
nss: add chacha20-poly1305 cipher suites if supported by NSS
-rw-r--r--RELEASE-NOTES2
-rw-r--r--lib/vtls/nss.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bba03976d..4633f089a 100644
--- 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 1d006ea0a..8c945548a 100644
--- 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";