commit 01f6bdccb99e85791ecfd4710998eb216b7965a3
parent 741973c2ce559ca3ca550a27113bd9d984770390
Author: Dennis Jackson <git@dennis-jackson.uk>
Date: Thu, 8 Jan 2026 12:09:17 +0000
Bug 2004184 - upgrade NSS to NSS_3_120_RTM. r=nss-reviewers,bbeurdouche UPGRADE_NSS_RELEASE
Differential Revision: https://phabricator.services.mozilla.com/D278271
Diffstat:
10 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_119_RTM
-\ No newline at end of file
+NSS_3_120_RTM
+\ No newline at end of file
diff --git a/security/nss/automation/release/nss-release-helper.py b/security/nss/automation/release/nss-release-helper.py
@@ -467,7 +467,7 @@ def generate_release_note(args):
rst_content = f""".. _mozilla_projects_nss_nss_{version_underscore}_release_notes:
NSS {version} release notes
-========================
+===============================
`Introduction <#introduction>`__
--------------------------------
diff --git a/security/nss/doc/rst/releases/index.rst b/security/nss/doc/rst/releases/index.rst
@@ -8,6 +8,7 @@ Release Notes
:glob:
:hidden:
+ nss_3_120.rst
nss_3_119_1.rst
nss_3_119.rst
nss_3_118_1.rst
@@ -99,8 +100,8 @@ Release Notes
.. note::
- **NSS 3.119.1** is the latest version of NSS.
- Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_119_1_release_notes`
+ **NSS 3.120** is the latest version of NSS.
+ Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_120_release_notes`
**NSS 3.112.2 (ESR)** is the latest ESR version of NSS.
Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_112_2_release_notes`
diff --git a/security/nss/doc/rst/releases/nss_3_119_1.rst b/security/nss/doc/rst/releases/nss_3_119_1.rst
@@ -1,7 +1,7 @@
.. _mozilla_projects_nss_nss_3_119_1_release_notes:
NSS 3.119.1 release notes
-========================
+=========================
`Introduction <#introduction>`__
--------------------------------
diff --git a/security/nss/doc/rst/releases/nss_3_120.rst b/security/nss/doc/rst/releases/nss_3_120.rst
@@ -0,0 +1,39 @@
+.. _mozilla_projects_nss_nss_3_120_release_notes:
+
+NSS 3.120 release notes
+===============================
+
+`Introduction <#introduction>`__
+--------------------------------
+
+.. container::
+
+ Network Security Services (NSS) 3.120 was released on *8 January 2026**.
+
+`Distribution Information <#distribution_information>`__
+--------------------------------------------------------
+
+.. container::
+
+ The HG tag is NSS_3_120_RTM. NSS 3.120 requires NSPR 4.38.2 or newer.
+
+ NSS 3.120 source distributions are available on ftp.mozilla.org for secure HTTPS download:
+
+ - Source tarballs:
+ https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_120_RTM/src/
+
+ Other releases are available :ref:`mozilla_projects_nss_releases`.
+
+.. _changes_in_nss_3.120:
+
+`Changes in NSS 3.120 <#changes_in_nss_3.120>`__
+------------------------------------------------------------------
+
+.. container::
+
+ - Bug 2008768 - Fix docs generation bug.
+ - Bug 2007908 - CID 1678226: Dereferencing null pointer plaintext.data().
+ - Bug 2004694 - Run PKCS12 fuzz target with --fuzz=tls in CI.
+ - Bug 1978603 - Allowing RT be started several times.
+ - Bug 2005751 - move linux decision and build tasks to d2g worker pools.
+
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
@@ -22,12 +22,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define NSS_VERSION "3.120" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.120" _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 120
#define NSS_VPATCH 0
#define NSS_VBUILD 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
@@ -17,11 +17,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define SOFTOKEN_VERSION "3.120" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.120" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 120
#define SOFTOKEN_VPATCH 0
#define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
@@ -19,12 +19,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
-#define NSSUTIL_VERSION "3.120 Beta"
+#define NSSUTIL_VERSION "3.120"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 120
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_TRUE
+#define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS
diff --git a/security/nss/moz.yaml b/security/nss/moz.yaml
@@ -9,8 +9,8 @@ origin:
description: nss
url: https://hg-edge.mozilla.org/projects/nss
- release: 213eff47d0697b06a123d954db4ce2fd46e5bd1a (2025-12-19T12:24:11Z).
- revision: 213eff47d0697b06a123d954db4ce2fd46e5bd1a
+ release: cea810c3cabddccb8155ae5543ae7cc8be98c595 (2026-01-08T11:14:43Z).
+ revision: cea810c3cabddccb8155ae5543ae7cc8be98c595
license: MPL-2.0
license-file: COPYING
@@ -42,4 +42,4 @@ updatebot:
- type: vendoring
enabled: true
frequency: 1 week
- blocking: 2004184
+ blocking: 2009146
diff --git a/security/nss/taskcluster/kinds/fuzz/kind.yml b/security/nss/taskcluster/kinds/fuzz/kind.yml
@@ -111,7 +111,7 @@ tasks:
task-context:
from-object:
target: pkcs12
- corpus: pkcs12
+ corpus: pkcs12-no_fuzzer_mode
linux64-quickder:
description: Linux x64 QuickDER
@@ -195,6 +195,18 @@ tasks:
symbol: Cryptofuzz
platform: linux64/debug-fuzz
+ linux64-tlsfuzz-pkcs12:
+ description: Linux x64 PKCS12
+ dependencies:
+ build: build-linux64/debug-tlsfuzz
+ treeherder:
+ symbol: TLS(PKCS12)
+ platform: linux64/debug-fuzz
+ task-context:
+ from-object:
+ target: pkcs12
+ corpus: pkcs12
+
linux64-tlsfuzz-tls-client:
description: Linux x64 TLS Client
dependencies:
@@ -313,7 +325,7 @@ tasks:
task-context:
from-object:
target: pkcs12
- corpus: pkcs12
+ corpus: pkcs12-no_fuzzer_mode
linux32-quickder:
description: Linux 32 QuickDER
@@ -397,6 +409,18 @@ tasks:
symbol: Cryptofuzz
platform: linux32/debug-fuzz
+ linux32-tlsfuzz-pkcs12:
+ description: Linux 32 PKCS12
+ dependencies:
+ build: build-linux32/debug-tlsfuzz
+ treeherder:
+ symbol: TLS(PKCS12)
+ platform: linux32/debug-fuzz
+ task-context:
+ from-object:
+ target: pkcs12
+ corpus: pkcs12
+
linux32-tlsfuzz-tls-client:
description: Linux 32 TLS Client
dependencies:
