summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Beurdouche <bbeurdouche@mozilla.com>2021-05-28 12:40:39 +0200
committerBenjamin Beurdouche <bbeurdouche@mozilla.com>2021-05-28 12:40:39 +0200
commite4122108c8cde74c0f733ba037080a12fd2e0445 (patch)
tree5326b0bbb70b30297c823329de2b6afc69f0f61e
parentfd4ca321bbd97e52675b89b5dcd9ea9fb29cb7ab (diff)
downloadnss-hg-e4122108c8cde74c0f733ba037080a12fd2e0445.tar.gz
Set version numbers to 3.67 Beta
-rw-r--r--automation/abi-check/expected-report-libnss3.so.txt17
-rw-r--r--automation/abi-check/expected-report-libssl3.so.txt10
-rw-r--r--automation/abi-check/previous-nss-release2
-rw-r--r--lib/nss/nss.h4
-rw-r--r--lib/softoken/softkver.h4
-rw-r--r--lib/util/nssutil.h4
6 files changed, 7 insertions, 34 deletions
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt
index d34243d92..e69de29bb 100644
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,17 +0,0 @@
-
-3 Added functions:
-
- 'function PRBool PK11_ContextGetFIPSStatus(PK11Context*)' {PK11_ContextGetFIPSStatus@@NSS_3.66}
- 'function PRBool PK11_ObjectGetFIPSStatus(PK11ObjectType, void*)' {PK11_ObjectGetFIPSStatus@@NSS_3.66}
- 'function PRBool PK11_SlotGetLastFIPSStatus(PK11SlotInfo*)' {PK11_SlotGetLastFIPSStatus@@NSS_3.66}
-
-1 function with some indirect sub-type change:
-
- [C]'function SECStatus PK11_GetModInfo(SECMODModule*, CK_INFO*)' at pk11util.c:613:1 has some indirect sub-type changes:
- parameter 1 of type 'SECMODModule*' has sub-type changes:
- in pointed to type 'typedef SECMODModule' at secmodt.h:29:1:
- underlying type 'struct SECMODModuleStr' at secmodt.h:44:1 changed:
- type size changed from 1664 to 1728 bits
- 1 data member insertion:
- 'CK_NSS_GetFIPSStatus SECMODModuleStr::fipsIndicator', at offset 1664 (in bits) at secmodt.h:79:1
- no data member changes (2 filtered);
diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt
index e3bb57179..e69de29bb 100644
--- 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:383:1:
- underlying type 'struct SSLChannelInfoStr' at sslt.h:299:1 changed:
- type size changed from 1024 to 1088 bits
- 1 data member insertion:
- 'PRBool SSLChannelInfoStr::isFIPS', at offset 1024 (in bits) at sslt.h:379:1
diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
index 3b5b3cf15..24e832fc4 100644
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_65_BRANCH
+NSS_3_66_BRANCH
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 6439ec050..909fd29e9 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.66" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.67" _NSS_CUSTOMIZED " Beta"
#define NSS_VMAJOR 3
-#define NSS_VMINOR 66
+#define NSS_VMINOR 67
#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 4c749990e..a1b71d01c 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.66" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.67" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 66
+#define SOFTOKEN_VMINOR 67
#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 adf6f7717..8b7184b1c 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.66 Beta"
+#define NSSUTIL_VERSION "3.67 Beta"
#define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 66
+#define NSSUTIL_VMINOR 67
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE