From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 7 Mar 2014 12:10:54 +0000 (+0100)
Subject: nss: allow to enable/disable new HMAC-SHA256 cipher-suites
X-Git-Tag: curl-7_36_0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c864d81289297b04dbbca14e3c5307ef15e6f258;p=thirdparty%2Fcurl.git

nss: allow to enable/disable new HMAC-SHA256 cipher-suites

... if built against a new enough version of NSS
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index e22b09841b..119a910fe2 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -155,6 +155,16 @@ static const cipher_s cipherlist[] = {
   {"ecdh_anon_3des_sha",         TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA},
   {"ecdh_anon_aes_128_sha",      TLS_ECDH_anon_WITH_AES_128_CBC_SHA},
   {"ecdh_anon_aes_256_sha",      TLS_ECDH_anon_WITH_AES_256_CBC_SHA},
+#ifdef TLS_RSA_WITH_NULL_SHA256
+  /* new HMAC-SHA256 cipher suites specified in RFC */
+  {"rsa_null_sha_256",                TLS_RSA_WITH_NULL_SHA256},
+  {"rsa_aes_128_cbc_sha_256",         TLS_RSA_WITH_AES_128_CBC_SHA256},
+  {"rsa_aes_256_cbc_sha_256",         TLS_RSA_WITH_AES_256_CBC_SHA256},
+  {"dhe_rsa_aes_128_cbc_sha_256",     TLS_DHE_RSA_WITH_AES_128_CBC_SHA256},
+  {"dhe_rsa_aes_256_cbc_sha_256",     TLS_DHE_RSA_WITH_AES_256_CBC_SHA256},
+  {"ecdhe_ecdsa_aes_128_cbc_sha_256", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256},
+  {"ecdhe_rsa_aes_128_cbc_sha_256",   TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256},
+#endif
 };
 
 static const char* pem_library = "libnsspem.so";