summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Beurdouche <bbeurdouche@mozilla.com>2021-05-14 12:48:11 +0200
committerBenjamin Beurdouche <bbeurdouche@mozilla.com>2021-05-14 12:48:11 +0200
commit5a3b10a939f5e7a6e0fa502cd0aab1011f495829 (patch)
treea88aa354f92812c1d1c295bb6607e65c5a13c173
parent9e3c9c5f2cbb4d974c6414adcd08f6ef5233f95e (diff)
downloadnss-hg-5a3b10a939f5e7a6e0fa502cd0aab1011f495829.tar.gz
Set version numbers to 3.66 Beta
-rw-r--r--automation/abi-check/expected-report-libnss3.so.txt18
-rw-r--r--automation/abi-check/expected-report-libssl3.so.txt11
-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, 36 deletions
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt
index a6dbb05bf..e69de29bb 100644
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,18 +0,0 @@
-
-5 Added functions:
-
- 'function SECOidTag HASH_GetHMACOidTagByHashOidTag(SECOidTag)' {HASH_GetHMACOidTagByHashOidTag@@NSS_3.65}
- 'function PK11Context* PK11_CreateContextByPrivKey(CK_MECHANISM_TYPE, CK_ATTRIBUTE_TYPE, SECKEYPrivateKey*, const SECItem*)' {PK11_CreateContextByPrivKey@@NSS_3.65}
- 'function PK11Context* PK11_CreateContextByPubKey(CK_MECHANISM_TYPE, CK_ATTRIBUTE_TYPE, SECKEYPublicKey*, const SECItem*, void*)' {PK11_CreateContextByPubKey@@NSS_3.65}
- 'function SECKEYEncryptedPrivateKeyInfo* PK11_ExportEncryptedPrivKeyInfoV2(PK11SlotInfo*, SECOidTag, SECOidTag, SECOidTag, SECItem*, SECKEYPrivateKey*, int, void*)' {PK11_ExportEncryptedPrivKeyInfoV2@@NSS_3.65}
- 'function SECKEYEncryptedPrivateKeyInfo* PK11_ExportEncryptedPrivateKeyInfoV2(PK11SlotInfo*, SECOidTag, SECOidTag, SECOidTag, SECItem*, CERTCertificate*, int, void*)' {PK11_ExportEncryptedPrivateKeyInfoV2@@NSS_3.65}
-
-1 function with some indirect sub-type change:
-
- [C]'function PK11Context* PK11_CreateContextBySymKey(CK_MECHANISM_TYPE, CK_ATTRIBUTE_TYPE, PK11SymKey*, SECItem*)' at pk11cxt.c:493:1 has some indirect sub-type changes:
- parameter 4 of type 'SECItem*' changed:
- in pointed to type 'typedef SECItem':
- entity changed from 'typedef SECItem' to 'const SECItem'
- type size hasn't changed
-
-
diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt
index c547a45b3..e69de29bb 100644
--- a/automation/abi-check/expected-report-libssl3.so.txt
+++ b/automation/abi-check/expected-report-libssl3.so.txt
@@ -1,11 +0,0 @@
-
-1 function with some indirect sub-type change:
-
- [C]'function SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc*, SSLExtensionType, PRBool*)' at sslreveal.c:72:1 has some indirect sub-type changes:
- parameter 2 of type 'typedef SSLExtensionType' has sub-type changes:
- underlying type 'enum __anonymous_enum__' at sslt.h:519:1 changed:
- type size hasn't changed
- 1 enumerator change:
- '__anonymous_enum__::ssl_tls13_encrypted_client_hello_xtn' from value '65033' to '65034' at sslt.h:519:1
-
-
diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
index 059f1fd47..3b5b3cf15 100644
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_64_BRANCH
+NSS_3_65_BRANCH
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 2b0b0526d..6439ec050 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.65" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.66" _NSS_CUSTOMIZED " Beta"
#define NSS_VMAJOR 3
-#define NSS_VMINOR 65
+#define NSS_VMINOR 66
#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 6546cc050..4c749990e 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.65" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.66" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 65
+#define SOFTOKEN_VMINOR 66
#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 fb98d11f5..adf6f7717 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.65 Beta"
+#define NSSUTIL_VERSION "3.66 Beta"
#define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 65
+#define NSSUTIL_VMINOR 66
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE