diff options
author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2021-02-19 12:25:20 +0100 |
---|---|---|
committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2021-02-19 12:25:20 +0100 |
commit | fbd4c6c38563384010229190b57a485ef670eaee (patch) | |
tree | 3ca92552f81dfd8b4b3e09937bec73c4255acae9 | |
parent | 2c79b4b0032f776e0e2498b12ab0c636807b8df8 (diff) | |
download | nss-hg-fbd4c6c38563384010229190b57a485ef670eaee.tar.gz |
Set version numbers to 3.63 Beta
-rw-r--r-- | automation/abi-check/expected-report-libnss3.so.txt | 5 | ||||
-rw-r--r-- | automation/abi-check/expected-report-libssl3.so.txt | 11 | ||||
-rw-r--r-- | automation/abi-check/previous-nss-release | 2 | ||||
-rw-r--r-- | lib/nss/nss.h | 4 | ||||
-rw-r--r-- | lib/softoken/softkver.h | 4 | ||||
-rw-r--r-- | lib/util/nssutil.h | 4 |
6 files changed, 7 insertions, 23 deletions
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt index 20c74c711..e69de29bb 100644 --- a/automation/abi-check/expected-report-libnss3.so.txt +++ b/automation/abi-check/expected-report-libnss3.so.txt @@ -1,5 +0,0 @@ - -2 Added functions: - - 'function SECStatus PK11_HPKE_ExportContext(const HpkeContext*, PK11SymKey*, SECItem**)' {PK11_HPKE_ExportContext@@NSS_3.62} - 'function HpkeContext* PK11_HPKE_ImportContext(const SECItem*, PK11SymKey*)' {PK11_HPKE_ImportContext@@NSS_3.62} diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt index 15e1f47da..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 insertion: - '__anonymous_enum__::ssl_tls13_ech_is_inner_xtn' value '55817' - 1 enumerator change: - '__anonymous_enum__::ssl_tls13_encrypted_client_hello_xtn' from value '65032' to '65033' at sslt.h:519:1 diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release index e177689f5..858dd4efa 100644 --- a/automation/abi-check/previous-nss-release +++ b/automation/abi-check/previous-nss-release @@ -1 +1 @@ -NSS_3_61_BRANCH +NSS_3_62_BRANCH diff --git a/lib/nss/nss.h b/lib/nss/nss.h index 64f0d12d1..e03fcf749 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.62" _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.63" _NSS_CUSTOMIZED " Beta" #define NSS_VMAJOR 3 -#define NSS_VMINOR 62 +#define NSS_VMINOR 63 #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 06e77242d..0e8da185e 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.62" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.63" SOFTOKEN_ECC_STRING " Beta" #define SOFTOKEN_VMAJOR 3 -#define SOFTOKEN_VMINOR 62 +#define SOFTOKEN_VMINOR 63 #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 3785f7723..016c8fda5 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.62 Beta" +#define NSSUTIL_VERSION "3.63 Beta" #define NSSUTIL_VMAJOR 3 -#define NSSUTIL_VMINOR 62 +#define NSSUTIL_VMINOR 63 #define NSSUTIL_VPATCH 0 #define NSSUTIL_VBUILD 0 #define NSSUTIL_BETA PR_TRUE |