diff options
author | J.C. Jones <jjones@mozilla.com> | 2020-10-16 07:52:07 -0700 |
---|---|---|
committer | J.C. Jones <jjones@mozilla.com> | 2020-10-16 07:52:07 -0700 |
commit | bbbc9e073fb449e0ef9df11ba410013bee5f7076 (patch) | |
tree | 1369ff3fccb701563f1893b1b8eefa182e74d4d9 | |
parent | 1ef2328b160ce1f7bb047421b4e799384b93cfa7 (diff) | |
download | nss-hg-bbbc9e073fb449e0ef9df11ba410013bee5f7076.tar.gz |
Set version numbers to 3.59 Beta
-rw-r--r-- | automation/abi-check/expected-report-libnss3.so.txt | 15 | ||||
-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 |
5 files changed, 7 insertions, 22 deletions
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt index 17ee6232c..e69de29bb 100644 --- a/automation/abi-check/expected-report-libnss3.so.txt +++ b/automation/abi-check/expected-report-libnss3.so.txt @@ -1,15 +0,0 @@ - -12 Added functions: - - [A] 'function SECStatus PK11_HPKE_Deserialize(const HpkeContext*, const PRUint8*, unsigned int, SECKEYPublicKey**)' {PK11_HPKE_Deserialize@@NSS_3.58} - [A] 'function void PK11_HPKE_DestroyContext(HpkeContext*, PRBool)' {PK11_HPKE_DestroyContext@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_ExportSecret(const HpkeContext*, const SECItem*, unsigned int, PK11SymKey**)' {PK11_HPKE_ExportSecret@@NSS_3.58} - [A] 'function const SECItem* PK11_HPKE_GetEncapPubKey(const HpkeContext*)' {PK11_HPKE_GetEncapPubKey@@NSS_3.58} - [A] 'function HpkeContext* PK11_HPKE_NewContext(HpkeKemId, HpkeKdfId, HpkeAeadId, PK11SymKey*, const SECItem*)' {PK11_HPKE_NewContext@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_Open(HpkeContext*, const SECItem*, const SECItem*, SECItem**)' {PK11_HPKE_Open@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_Seal(HpkeContext*, const SECItem*, const SECItem*, SECItem**)' {PK11_HPKE_Seal@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_Serialize(const SECKEYPublicKey*, PRUint8*, unsigned int*, unsigned int)' {PK11_HPKE_Serialize@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_SetupR(HpkeContext*, const SECKEYPublicKey*, SECKEYPrivateKey*, const SECItem*, const SECItem*)' {PK11_HPKE_SetupR@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_SetupS(HpkeContext*, const SECKEYPublicKey*, SECKEYPrivateKey*, SECKEYPublicKey*, const SECItem*)' {PK11_HPKE_SetupS@@NSS_3.58} - [A] 'function SECStatus PK11_HPKE_ValidateParameters(HpkeKemId, HpkeKdfId, HpkeAeadId)' {PK11_HPKE_ValidateParameters@@NSS_3.58} - [A] 'function PK11SymKey* PK11_ImportDataKey(PK11SlotInfo*, CK_MECHANISM_TYPE, PK11Origin, CK_ATTRIBUTE_TYPE, SECItem*, void*)' {PK11_ImportDataKey@@NSS_3.58} diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release index 1af6dbd13..a37de0565 100644 --- a/automation/abi-check/previous-nss-release +++ b/automation/abi-check/previous-nss-release @@ -1 +1 @@ -NSS_3_57_BRANCH +NSS_3_58_BRANCH diff --git a/lib/nss/nss.h b/lib/nss/nss.h index c1ce11401..54ca3371f 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.58" _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.59" _NSS_CUSTOMIZED " Beta" #define NSS_VMAJOR 3 -#define NSS_VMINOR 58 +#define NSS_VMINOR 59 #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 1102584b2..104511bca 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.58" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.59" SOFTOKEN_ECC_STRING " Beta" #define SOFTOKEN_VMAJOR 3 -#define SOFTOKEN_VMINOR 58 +#define SOFTOKEN_VMINOR 59 #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 459e70d6f..17ee1316e 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.58 Beta" +#define NSSUTIL_VERSION "3.59 Beta" #define NSSUTIL_VMAJOR 3 -#define NSSUTIL_VMINOR 58 +#define NSSUTIL_VMINOR 59 #define NSSUTIL_VPATCH 0 #define NSSUTIL_VBUILD 0 #define NSSUTIL_BETA PR_TRUE |