Set version numbers to 3.54 beta
authorJ.C. Jones <jjones@mozilla.com>
Fri, 29 May 2020 13:35:53 -0700
changeset 15640 8dc4772bd678f101a38d547c3eddad1b2983d547
parent 15637 90c954f62c9d35925be4f38faa8fc6d740902613
child 15641 61c83f79e90c4fdd159f0ee12d559f26c5f46f74
push id3760
push userjjones@mozilla.com
push dateFri, 29 May 2020 20:50:59 +0000
Set version numbers to 3.54 beta
automation/abi-check/expected-report-libnss3.so.txt
automation/abi-check/previous-nss-release
lib/nss/nss.h
lib/softoken/softkver.h
lib/util/nssutil.h
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,5 +0,0 @@
-
-1 Added function:
-
-  [A] 'function PRBool SECMOD_GetSystemFIPSEnabled()'    {SECMOD_GetSystemFIPSEnabled@@NSS_3.53}
-
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1,1 +1,1 @@
-NSS_3_52_BRANCH
+NSS_3_53_BRANCH
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -17,19 +17,19 @@
 
 /*
  * 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.53" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.54" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 53
+#define NSS_VMINOR 54
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
 #define NSS_BETA PR_TRUE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -12,16 +12,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.53" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.54" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 53
+#define SOFTOKEN_VMINOR 54
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -14,19 +14,19 @@
 
 /*
  * 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.53 Beta"
+#define NSSUTIL_VERSION "3.54 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 53
+#define NSSUTIL_VMINOR 54
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.