set NSS trunk version number to 3.37 beta

5 files changed, 7 insertions, 35 deletions

diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt
index 366591b84..e69de29bb 100644
--- a/automation/abi-check/expected-report-libssl3.so.txt
+++ b/automation/abi-check/expected-report-libssl3.so.txt
@@ -1,28 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:12: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:318:1:
-        underlying type 'struct SSLChannelInfoStr' at sslt.h:259:1 changed:
-          type size hasn't changed
-          1 data member change:
-           type of 'SSLSignatureScheme SSLChannelInfoStr::signatureScheme' changed:
-             underlying type 'enum __anonymous_enum__' at sslt.h:115:1 changed:
-               type size hasn't changed
-               3 enumerator deletions:
-                 '__anonymous_enum__::ssl_sig_rsa_pss_sha256' value '2052'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_sha384' value '2053'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_sha512' value '2054'
-
-               6 enumerator insertions:
-                 '__anonymous_enum__::ssl_sig_rsa_pss_rsae_sha256' value '2052'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_rsae_sha384' value '2053'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_rsae_sha512' value '2054'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_pss_sha256' value '2057'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_pss_sha384' value '2058'
-                 '__anonymous_enum__::ssl_sig_rsa_pss_pss_sha512' value '2059'
-
-
-
-
diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
index c213ca3f8..e5a15138b 100644
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_35_BRANCH
+NSS_3_36_BRANCH
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 63b80a2f9..a892ad098 100644
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -22,9 +22,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.36" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.37" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 36
+#define NSS_VMINOR 37
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
 #define NSS_BETA PR_TRUE
diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
index e2fd138d9..7e8ceb766 100644
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -17,9 +17,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.36" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.37" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 36
+#define SOFTOKEN_VMINOR 37
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_TRUE
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
index bd25bf82f..d9ff8225d 100644
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -19,9 +19,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.36 Beta"
+#define NSSUTIL_VERSION "3.37 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 36
+#define NSSUTIL_VMINOR 37
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE