Set version numbers to 3.55 beta
authorKevin Jacobs <kjacobs@mozilla.com>
Fri, 26 Jun 2020 08:42:39 -0700
changeset 15683 332ab7db68baefb1737d527167beb1da26b1bba1
parent 15680 87fa2f0598ad5c0294298ea83e9c4d9dec31a1fc
child 15684 d45f9bb5faac795c1328f6709a4fc3c743781cc5
push id3781
push userkjacobs@mozilla.com
push dateFri, 26 Jun 2020 15:56:17 +0000
Set version numbers to 3.55 beta
automation/abi-check/expected-report-libssl3.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-libssl3.so.txt
+++ b/automation/abi-check/expected-report-libssl3.so.txt
@@ -1,10 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C] 'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:14:1 has some indirect sub-type changes:
-    parameter 2 of type 'SSLChannelInfo*' has sub-type changes:
-      in pointed to type 'typedef SSLChannelInfo' at sslt.h:373:1:
-        underlying type 'struct SSLChannelInfoStr' at sslt.h:293:1 changed:
-          type size changed from 960 to 1024 (in bits)
-          1 data member insertion:
-            'SSLPskType SSLChannelInfoStr::pskType', at offset 960 (in bits) at sslt.h:369:1
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1,1 +1,1 @@
-NSS_3_53_BRANCH
+NSS_3_54_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.54" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.55" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 54
+#define NSS_VMINOR 55
 #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.54" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.55" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 54
+#define SOFTOKEN_VMINOR 55
 #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.54 Beta"
+#define NSSUTIL_VERSION "3.55 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 54
+#define NSSUTIL_VMINOR 55
 #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.