Bug 1144055 - Upgrade Firefox 39 to use NSS 3.19, landing NSS_3_19_BETA5, r=nss-confcall, a=lmandel
authorKai Engert <kaie@kuix.de>
Thu, 23 Apr 2015 21:20:01 +0200
changeset 267193 0611d677bc9592426ef27ac19694b8f88fdf4295
parent 267192 d59562df72f06013ff6d8cc634c83af56919d0c3
child 267194 d7b3074eb9720b4a5fe074c64f4e5ff20b0548de
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnss-confcall, lmandel
bugs1144055
milestone39.0a2
Bug 1144055 - Upgrade Firefox 39 to use NSS 3.19, landing NSS_3_19_BETA5, r=nss-confcall, a=lmandel
security/nss/TAG-INFO
security/nss/coreconf/coreconf.dep
security/nss/lib/ssl/ssl3ext.c
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_19_BETA4
+NSS_3_19_BETA5
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -5,8 +5,9 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSS in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
+
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -2370,20 +2370,22 @@ static PRInt32
 ssl3_ClientSendSigAlgsXtn(sslSocket * ss, PRBool append, PRUint32 maxBytes)
 {
     static const unsigned char signatureAlgorithms[] = {
         /* This block is the contents of our signature_algorithms extension, in
          * wire format. See
          * 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,
         tls_hash_sha1,   tls_sig_dsa,
     };
     PRInt32 extension_length;
 
     if (ss->version < SSL_LIBRARY_VERSION_TLS_1_2) {