Bug 1158489, Upgrade to NSS 3.19.2.2, a=lmandel
authorKai Engert <kaie@kuix.de>
Thu, 14 Jan 2016 00:40:14 +0100
changeset 260902 9a92b504c10aedc853786c37cb83f276ba2d733a
parent 260901 fceff80a84a32b68d02abc00486fe6c7b86d545b
child 260903 90b37013db55e2fd143fe1f905d7e7dd96f393b8
push id248
push userkaie@kuix.de
push dateWed, 13 Jan 2016 23:40:26 +0000
treeherdermozilla-esr38@9a92b504c10a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslmandel
bugs1158489
milestone38.5.1
Bug 1158489, Upgrade to NSS 3.19.2.2, a=lmandel
security/nss/TAG-INFO
security/nss/coreconf/coreconf.dep
security/nss/lib/nss/nss.h
security/nss/lib/softoken/softkver.h
security/nss/lib/ssl/ssl3con.c
security/nss/lib/util/nssutil.h
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_19_2_1_RTM
+NSS_3_19_2_2_RTM
--- 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/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -28,21 +28,21 @@
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.19.2.1" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.19.2.2" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   19
 #define NSS_VPATCH   2
-#define NSS_VBUILD   1
+#define NSS_VBUILD   2
 #define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -20,16 +20,16 @@
 
 /*
  * Softoken's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.19.2.1" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.19.2.2" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   19
 #define SOFTOKEN_VPATCH   2
-#define SOFTOKEN_VBUILD   1
+#define SOFTOKEN_VBUILD   2
 #define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -4345,17 +4345,16 @@ ssl3_ConsumeHandshakeVariable(sslSocket 
 }
 
 /* tlsHashOIDMap contains the mapping between TLS hash identifiers and the
  * SECOidTag used internally by NSS. */
 static const struct {
     int tlsHash;
     SECOidTag oid;
 } tlsHashOIDMap[] = {
-    { tls_hash_md5, SEC_OID_MD5 },
     { tls_hash_sha1, SEC_OID_SHA1 },
     { tls_hash_sha224, SEC_OID_SHA224 },
     { tls_hash_sha256, SEC_OID_SHA256 },
     { tls_hash_sha384, SEC_OID_SHA384 },
     { tls_hash_sha512, SEC_OID_SHA512 }
 };
 
 /* ssl3_TLSHashAlgorithmToOID converts a TLS hash identifier into an OID value.
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -14,21 +14,21 @@
 
 /*
  * NSS utilities's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.19.2.1"
+#define NSSUTIL_VERSION  "3.19.2.2"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   19
 #define NSSUTIL_VPATCH   2
-#define NSSUTIL_VBUILD   1
+#define NSSUTIL_VBUILD   2
 #define NSSUTIL_BETA     PR_FALSE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.
  */
 extern const char *NSSUTIL_GetVersion(void);