Set version numbers to 3.46 beta
authorJ.C. Jones <jjones@mozilla.com>
Fri, 05 Jul 2019 09:04:29 -0700
changeset 15211 c94f163df71e067b92fe4c6c17b1d9a65efa9081
parent 15208 be9412c78d6b3d360831260d1a25025758c737bd
child 15212 264f19e7ede70c36cf00e83742a8cb4c88022e3e
push id3429
push userjjones@mozilla.com
push dateFri, 05 Jul 2019 16:07:24 +0000
Set version numbers to 3.46 beta
automation/abi-check/expected-report-libnss3.so.txt
automation/abi-check/expected-report-libssl3.so.txt
automation/abi-check/previous-nss-release
lib/nss/nss.h
lib/softoken/softkver.h
lib/util/nssutil.h
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,4 +0,0 @@
-
-1 Added function:
-
-  'function SECStatus PK11_FindRawCertsWithSubject(PK11SlotInfo*, SECItem*, CERTCertificateList**)'    {PK11_FindRawCertsWithSubject@@NSS_3.45}
--- a/automation/abi-check/expected-report-libssl3.so.txt
+++ b/automation/abi-check/expected-report-libssl3.so.txt
@@ -1,22 +0,0 @@
-
-2 functions with some indirect sub-type change:
-
-  [C]'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)' at sslcert.c:640:1 has some indirect sub-type changes:
-    parameter 4 of type 'const SSLExtraServerCertData*' has sub-type changes:
-      in pointed to type 'const SSLExtraServerCertData':
-        in unqualified underlying type 'typedef SSLExtraServerCertData' at sslt.h:291:1:
-          underlying type 'struct SSLExtraServerCertDataStr' at sslt.h:256:1 changed:
-            type size changed from 256 to 384 (in bits)
-            2 data member insertions:
-              'const SECItem* SSLExtraServerCertDataStr::delegCred', at offset 256 (in bits) at sslt.h:283:1
-              'const SECKEYPrivateKey* SSLExtraServerCertDataStr::delegCredPrivKey', at offset 320 (in bits) at sslt.h:290:1
-
-  [C]'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:13: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:357:1:
-        underlying type 'struct SSLChannelInfoStr' at sslt.h:272:1 changed:
-          type size hasn't changed
-          1 data member insertion:
-            'PRBool SSLChannelInfoStr::peerDelegCred', at offset 928 (in bits) at sslt.h:353:1
-
-
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1,1 +1,1 @@
-NSS_3_44_BRANCH
+NSS_3_45_BRANCH
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -17,19 +17,19 @@
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.45" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.46" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 45
+#define NSS_VMINOR 46
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
 #define NSS_BETA PR_TRUE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -12,16 +12,16 @@
 
 /*
  * Softoken's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.45" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.46" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 45
+#define SOFTOKEN_VMINOR 46
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -14,19 +14,19 @@
 
 /*
  * NSS utilities's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.45 Beta"
+#define NSSUTIL_VERSION "3.46 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 45
+#define NSSUTIL_VMINOR 46
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.