commit 3cd72f27da803a61e29cdb8db98bb545ef77c1af Author: Georg Koppen gk@torproject.org Date: Tue Jan 12 15:22:26 2016 +0000
Bug 18017: Bump NSS version to 3.19.2.2
This fixes the SLOTH attack (CVE-2015-7575). --- security/nss/lib/nss/nss.h | 4 ++-- security/nss/lib/softoken/softkver.h | 4 ++-- security/nss/lib/ssl/ssl3con.c | 1 - security/nss/lib/util/nssutil.h | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 75e37de..71efa46 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -33,11 +33,11 @@ * 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 diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h index 75c9833..3ec6d0a 100644 --- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -25,11 +25,11 @@ * 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_ */ diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index e9f4223..982a378 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -4350,7 +4350,6 @@ 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 }, diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h index 62791e0..fa2afd9 100644 --- a/security/nss/lib/util/nssutil.h +++ b/security/nss/lib/util/nssutil.h @@ -19,11 +19,11 @@ * 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