[tbb-commits] [tor-browser] 41/43: Bug 1770397 - land NSS NSS_3_68_4_RTM UPGRADE_NSS_RELEASE. r=jschanck, a=RyanVM

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-91.10.0esr-11.0-1
in repository tor-browser.

commit ea17ae7765e4b5255ef7883cd67d54dc0d97ec38
Author: Dennis Jackson <djackson at mozilla.com>
AuthorDate: Fri May 20 12:04:19 2022 +0000

    Bug 1770397 - land NSS NSS_3_68_4_RTM UPGRADE_NSS_RELEASE. r=jschanck, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D146905
---
 security/nss/TAG-INFO                 | 2 +-
 security/nss/cmd/smimetools/cmsutil.c | 2 +-
 security/nss/coreconf/coreconf.dep    | 1 +
 security/nss/lib/nss/nss.h            | 4 ++--
 security/nss/lib/smime/cmsdigest.c    | 4 ++--
 security/nss/lib/softoken/softkver.h  | 4 ++--
 security/nss/lib/util/nssutil.h       | 4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 3c0affe5d52d1..ae046b6181855 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_68_3_RTM
\ No newline at end of file
+NSS_3_68_4_RTM
\ No newline at end of file
diff --git a/security/nss/cmd/smimetools/cmsutil.c b/security/nss/cmd/smimetools/cmsutil.c
index 9106d9955bab6..4343695ede746 100644
--- a/security/nss/cmd/smimetools/cmsutil.c
+++ b/security/nss/cmd/smimetools/cmsutil.c
@@ -219,7 +219,7 @@ decode(FILE *out, SECItem *input, const struct decodeOptionsStr *decodeOptions)
         switch (typetag) {
             case SEC_OID_PKCS7_SIGNED_DATA: {
                 NSSCMSSignedData *sigd = NULL;
-                SECItem **digests;
+                SECItem **digests = NULL;
                 int nsigners;
                 int j;
 
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 5182f75552c81..590d1bfaeee3f 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index d0c1a1f19a28e..ff5dc83767149 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -22,10 +22,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.68.3" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.68.4" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 68
-#define NSS_VPATCH 3
+#define NSS_VPATCH 4
 #define NSS_VBUILD 0
 #define NSS_BETA PR_FALSE
 
diff --git a/security/nss/lib/smime/cmsdigest.c b/security/nss/lib/smime/cmsdigest.c
index bd14740682e4a..1eb88f0b6305f 100644
--- a/security/nss/lib/smime/cmsdigest.c
+++ b/security/nss/lib/smime/cmsdigest.c
@@ -239,7 +239,7 @@ NSS_CMSDigestContext_FinishSingle(NSSCMSDigestContext *cmsdigcx,
                                   SECItem *digest)
 {
     SECStatus rv = SECFailure;
-    SECItem **dp;
+    SECItem **dp = NULL;
     PLArenaPool *arena = NULL;
 
     if ((arena = PORT_NewArena(1024)) == NULL)
@@ -247,7 +247,7 @@ NSS_CMSDigestContext_FinishSingle(NSSCMSDigestContext *cmsdigcx,
 
     /* get the digests into arena, then copy the first digest into poolp */
     rv = NSS_CMSDigestContext_FinishMultiple(cmsdigcx, arena, &dp);
-    if (rv == SECSuccess) {
+    if (rv == SECSuccess && dp) {
         /* now copy it into poolp */
         rv = SECITEM_CopyItem(poolp, digest, dp[0]);
     }
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 929b9809e7b4c..bb31ca0735c6e 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -17,10 +17,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.68.3" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.68.4" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 68
-#define SOFTOKEN_VPATCH 3
+#define SOFTOKEN_VPATCH 4
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_FALSE
 
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 8548404b4755d..46ba50257dc6b 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -19,10 +19,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.68.3"
+#define NSSUTIL_VERSION "3.68.4"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 68
-#define NSSUTIL_VPATCH 3
+#define NSSUTIL_VPATCH 4
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_FALSE
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.