From 9470ab98738701de7d4cd5a22d2c6faf7bad83de Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Thu, 23 Apr 2015 21:16:20 +0200 Subject: [PATCH] Bug 1144055 - Upgrade Firefox 39 to use NSS 3.19, r=nss-confcall --- security/nss/TAG-INFO | 2 +- security/nss/coreconf/coreconf.dep | 1 + security/nss/lib/ssl/ssl3ext.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO index a82a9f3c94ec..a59e7c050646 100644 --- a/security/nss/TAG-INFO +++ b/security/nss/TAG-INFO @@ -1 +1 @@ -NSS_3_19_BETA4 +NSS_3_19_BETA5 diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep index 5182f75552c8..590d1bfaeee3 100644 --- a/security/nss/coreconf/coreconf.dep +++ b/security/nss/coreconf/coreconf.dep @@ -10,3 +10,4 @@ */ #error "Do not include this header file." + diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c index 6965a6df4ec7..28d21c4b1401 100644 --- a/security/nss/lib/ssl/ssl3ext.c +++ b/security/nss/lib/ssl/ssl3ext.c @@ -2375,10 +2375,12 @@ ssl3_ClientSendSigAlgsXtn(sslSocket * ss, PRBool append, PRUint32 maxBytes) * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 */ tls_hash_sha256, tls_sig_rsa, tls_hash_sha384, tls_sig_rsa, + tls_hash_sha512, tls_sig_rsa, tls_hash_sha1, tls_sig_rsa, #ifndef NSS_DISABLE_ECC tls_hash_sha256, tls_sig_ecdsa, tls_hash_sha384, tls_sig_ecdsa, + tls_hash_sha512, tls_sig_ecdsa, tls_hash_sha1, tls_sig_ecdsa, #endif tls_hash_sha256, tls_sig_dsa,