Bug 1277255, land NSS_3_25_RC1, r=me
authorKai Engert <kaie@kuix.de>
Mon, 20 Jun 2016 19:17:28 +0200
changeset 302102 c4be443b20d068b1a18b6929c6e2f76fef4de235
parent 302101 4e6b1c5bc5bf71c84ce30d37cf4944b4c2d3f761
child 302103 4a25006fb0ead19d818f6f030ed263ffe5f168a2
push id78593
push userkaie@kuix.de
push dateMon, 20 Jun 2016 17:17:34 +0000
treeherdermozilla-inbound@c4be443b20d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1277255
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1277255, land NSS_3_25_RC1, r=me
security/nss/TAG-INFO
security/nss/coreconf/coreconf.dep
security/nss/lib/freebl/Makefile
security/nss/lib/ssl/ssl3con.c
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_25_RC0
+NSS_3_25_RC1
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -5,9 +5,8 @@
 
 /*
  * 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/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -517,17 +517,28 @@ endif
 
 ifndef NSS_DISABLE_CHACHAPOLY
     ifeq ($(CPU_ARCH),x86_64)
         ifdef HAVE_INT128_SUPPORT
             EXTRA_SRCS += poly1305-donna-x64-sse2-incremental-source.c
         else
             EXTRA_SRCS += poly1305.c
         endif
-        EXTRA_SRCS += chacha20_vec.c
+
+        ifeq ($(OS_TARGET),SunOS)
+        ifndef NS_USE_GCC
+            CHACHA_NO_SSE2 = 1
+        endif
+        endif
+
+        ifdef CHACHA_NO_SSE2
+            EXTRA_SRCS += chacha20.c
+        else
+            EXTRA_SRCS += chacha20_vec.c
+        endif
     else
         EXTRA_SRCS += poly1305.c
         EXTRA_SRCS += chacha20.c
     endif # x86_64
 endif # NSS_DISABLE_CHACHAPOLY
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -4013,22 +4013,26 @@ ssl3_HandleChangeCipherSpecs(sslSocket *
     return SECSuccess;
 }
 
 /* Function valid for >= TLS 1.2, only. */
 static CK_MECHANISM_TYPE
 ssl3_GetHashMechanismByHashType(SSLHashType hashType)
 {
     switch (hashType) {
+        case ssl_hash_sha512:
+            return CKM_SHA512;
         case ssl_hash_sha384:
             return CKM_SHA384;
         case ssl_hash_sha256:
         case ssl_hash_none:
             /* ssl_hash_none is for pre-1.2 suites, which use SHA-256. */
             return CKM_SHA256;
+        case ssl_hash_sha1:
+            return CKM_SHA_1;
         default:
             PORT_Assert(0);
     }
     return CKM_SHA256;
 }
 
 /* Function valid for >= TLS 1.2, only. */
 static CK_MECHANISM_TYPE