Bug 1715772 - land NSS 0262a919f909 UPGRADE_NSS_RELEASE, r=beurdouche

Differential Revision: https://phabricator.services.mozilla.com/D118702

build/moz.configure/nss.configure

@@ -9,7 +9,7 @@ option("--with-system-nss", help="Use system NSS")
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 
 nss_pkg = pkg_check_modules(
-    "NSS", "nss >= 3.67", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.68", when="--with-system-nss", config=False
 )
 
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")

security/nss/TAG-INFO

@@ -1 +1 @@
-NSS_3_67_RTM
+0262a919f909

security/nss/automation/abi-check/previous-nss-release

@@ -1 +1 @@
-NSS_3_66_BRANCH
+NSS_3_67_BRANCH

security/nss/coreconf/coreconf.dep

@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+

security/nss/lib/mozpkix/include/pkix/Time.h

@@ -111,6 +111,9 @@ Time Now();
 // Note the epoch is the unix epoch (ie 00:00:00 UTC, 1 January 1970)
 Time TimeFromEpochInSeconds(uint64_t secondsSinceEpoch);
 
+// Note the epoch is the unix epoch (ie 00:00:00 UTC, 1 January 1970)
+Result SecondsSinceEpochFromTime(Time time, uint64_t* outSeconds);
+
 class Duration final {
  public:
   Duration(Time timeA, Time timeB)
@@ -129,6 +132,8 @@ class Duration final {
   }
 
  private:
+  friend Result SecondsSinceEpochFromTime(Time time, uint64_t* outSeconds);
+
   uint64_t durationInSeconds;
 };
 }

security/nss/lib/mozpkix/lib/pkixtime.cpp

@@ -75,4 +75,18 @@ TimeFromEpochInSeconds(uint64_t secondsSinceEpoch)
   return TimeFromElapsedSecondsAD(seconds);
 }
 
+Result
+SecondsSinceEpochFromTime(Time time, uint64_t* outSeconds)
+{
+  if (!outSeconds) {
+    return Result::FATAL_ERROR_INVALID_ARGS;
+  }
+  Time epoch = TimeFromEpochInSeconds(0);
+  if (time < epoch) {
+    return Result::FATAL_ERROR_INVALID_ARGS;
+  }
+  *outSeconds = Duration(time, epoch).durationInSeconds;
+  return Result::Success;
+}
+
 } } // namespace mozilla::pkix

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.67" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.68" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 67
+#define NSS_VMINOR 68
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
-#define NSS_BETA PR_FALSE
+#define NSS_BETA PR_TRUE
 
 #ifndef RC_INVOKED
 

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.67" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.68" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 67
+#define SOFTOKEN_VMINOR 68
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_FALSE
+#define SOFTOKEN_BETA PR_TRUE
 
 #endif /* _SOFTKVER_H_ */

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.67"
+#define NSSUTIL_VERSION "3.68 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 67
+#define NSSUTIL_VMINOR 68
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_FALSE
+#define NSSUTIL_BETA PR_TRUE
 
 SEC_BEGIN_PROTOS