diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt index fa6e674121..e69de29bb2 100644 --- a/automation/abi-check/expected-report-libnss3.so.txt +++ b/automation/abi-check/expected-report-libnss3.so.txt @@ -1,18 +0,0 @@ - -1 function with some indirect sub-type change: - - [C]'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2203:1 has some indirect sub-type changes: - parameter 2 of type 'typedef SECOidTag' has sub-type changes: - underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed: - type size hasn't changed - 4 enumerator insertions: - '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357' - '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360' - - 1 enumerator change: - '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' at secoidt.h:34:1 - - - diff --git a/automation/abi-check/expected-report-libnssutil3.so.txt b/automation/abi-check/expected-report-libnssutil3.so.txt index 971365c685..e69de29bb2 100644 --- a/automation/abi-check/expected-report-libnssutil3.so.txt +++ b/automation/abi-check/expected-report-libnssutil3.so.txt @@ -1,18 +0,0 @@ - -1 function with some indirect sub-type change: - - [C]'function SECStatus NSS_GetAlgorithmPolicy(SECOidTag, PRUint32*)' at secoid.c:2217:1 has some indirect sub-type changes: - parameter 1 of type 'typedef SECOidTag' has sub-type changes: - underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed: - type size hasn't changed - 4 enumerator insertions: - '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357' - '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360' - - 1 enumerator change: - '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' at secoidt.h:34:1 - - - diff --git a/automation/abi-check/expected-report-libsmime3.so.txt b/automation/abi-check/expected-report-libsmime3.so.txt index f4870feec6..e69de29bb2 100644 --- a/automation/abi-check/expected-report-libsmime3.so.txt +++ b/automation/abi-check/expected-report-libsmime3.so.txt @@ -1,48 +0,0 @@ - -1 function with some indirect sub-type change: - - [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:363:1 has some indirect sub-type changes: - parameter 1 of type 'NSSCMSContentInfo*' has sub-type changes: - in pointed to type 'typedef NSSCMSContentInfo' at cmst.h:54:1: - underlying type 'struct NSSCMSContentInfoStr' at cmst.h:126:1 changed: - type size hasn't changed - 1 data member changes (2 filtered): - type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed: - underlying type 'union NSSCMSContentUnion' at cmst.h:113:1 changed: - type size hasn't changed - 1 data member changes (3 filtered): - type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed: - in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1: - underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:463:1 changed: - type size hasn't changed - 1 data member changes (1 filtered): - type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed: - in pointed to type 'NSSCMSAttribute*': - in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1: - underlying type 'struct NSSCMSAttributeStr' at cmst.h:482:1 changed: - type size hasn't changed - 1 data member change: - type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed: - in pointed to type 'typedef SECOidData' at secoidt.h:16:1: - underlying type 'struct SECOidDataStr' at secoidt.h:513:1 changed: - type size hasn't changed - 1 data member change: - type of 'SECOidTag SECOidDataStr::offset' changed: - underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed: - type size hasn't changed - 4 enumerator insertions: - '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357' - '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359' - '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360' - - 1 enumerator change: - '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' at secoidt.h:34:1 - - - - - - - - diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release index 13a0361e35..eddef51b5c 100644 --- a/automation/abi-check/previous-nss-release +++ b/automation/abi-check/previous-nss-release @@ -1 +1 @@ -NSS_3_40_BRANCH +NSS_3_41_BRANCH diff --git a/lib/nss/nss.h b/lib/nss/nss.h index a14f55f585..6aacd11505 100644 --- a/lib/nss/nss.h +++ b/lib/nss/nss.h @@ -22,9 +22,9 @@ * The format of the version string should be * ".[.[.]][ ][ ]" */ -#define NSS_VERSION "3.41" _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.42" _NSS_CUSTOMIZED " Beta" #define NSS_VMAJOR 3 -#define NSS_VMINOR 41 +#define NSS_VMINOR 42 #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 e0f326f86f..fce0e9d979 100644 --- a/lib/softoken/softkver.h +++ b/lib/softoken/softkver.h @@ -17,9 +17,9 @@ * The format of the version string should be * ".[.[.]][ ][ ]" */ -#define SOFTOKEN_VERSION "3.41" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.42" SOFTOKEN_ECC_STRING " Beta" #define SOFTOKEN_VMAJOR 3 -#define SOFTOKEN_VMINOR 41 +#define SOFTOKEN_VMINOR 42 #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 15da77ee33..1aaa4bb1d0 100644 --- a/lib/util/nssutil.h +++ b/lib/util/nssutil.h @@ -19,9 +19,9 @@ * The format of the version string should be * ".[.[.]][ ]" */ -#define NSSUTIL_VERSION "3.41 Beta" +#define NSSUTIL_VERSION "3.42 Beta" #define NSSUTIL_VMAJOR 3 -#define NSSUTIL_VMINOR 41 +#define NSSUTIL_VMINOR 42 #define NSSUTIL_VPATCH 0 #define NSSUTIL_VBUILD 0 #define NSSUTIL_BETA PR_TRUE