Bug 898431: Update to NSS 3.15.4 beta 8 (NSS_3_15_4_BETA8), r=me, a=bbajaj
authorBrian Smith <brian@briansmith.org>
Thu, 05 Dec 2013 07:32:41 -0800
changeset 167624 1a29647ca0a62512e9649c5894090436216da568
parent 167623 9b1397fd27156597a552a86af93dbd59db7e734e
child 167625 155f0791ac678c324839d1b151396090b1f3cc3d
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, bbajaj
bugs898431
milestone27.0a2
Bug 898431: Update to NSS 3.15.4 beta 8 (NSS_3_15_4_BETA8), r=me, a=bbajaj
security/nss/TAG-INFO
security/nss/coreconf/coreconf.dep
security/nss/lib/ckfw/builtins/nssckbi.h
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_15_4_BETA7
+NSS_3_15_4_BETA8
--- 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/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -40,18 +40,18 @@
  *     ...
  *   - NSS 3.29 branch: 250-255
  *
  * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE.  It's not clear
  * whether we may use its full range (0-255) or only 0-99 because
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 95
-#define NSS_BUILTINS_LIBRARY_VERSION "1.95"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 96
+#define NSS_BUILTINS_LIBRARY_VERSION "1.96"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
 #define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
 
 /* These version numbers detail the semantic changes to ckbi itself 
  * (new PKCS #11 objects), etc. */
 #define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1