Bug 1029561, Update to NSS 3.16.3 after July 1st to include root CA updates, r=rrelyea

This commit is contained in:
Kai Engert 2014-07-03 17:24:18 +02:00
parent ec81f69d0f
commit b3a6a89654
9 changed files with 1515 additions and 877 deletions

View File

@ -1 +1 @@
NSS_3_16_2_RTM
NSS_3_16_3_RTM

View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

View File

@ -1561,6 +1561,12 @@ CERT_FindNameConstraintsExten(PLArenaPool *arena,
extern CERTGeneralName *
CERT_NewGeneralName(PLArenaPool *arena, CERTGeneralNameType type);
/*
* Lookup a CERTGeneralNameType constant by its human readable string.
*/
extern CERTGeneralNameType
CERT_GetGeneralNameTypeFromString(const char *string);
/*
* PKIX extension encoding routines
*/

View File

@ -26,9 +26,6 @@ cert_DecodeGeneralNames(PLArenaPool *arena, SECItem **encodedGenName);
extern SECStatus
cert_DestroyGeneralNames(CERTGeneralName *name);
extern CERTGeneralNameType
CERT_GetGeneralNameTypeFromString(const char *string);
extern SECStatus
cert_EncodeNameConstraints(CERTNameConstraints *constraints, PLArenaPool *arena,
SECItem *dest);

File diff suppressed because it is too large Load Diff

View File

@ -44,9 +44,9 @@
* whether we may use its full range (0-255) or only 0-99 because
* of the comment in the CK_VERSION type definition.
*/
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 98
#define NSS_BUILTINS_LIBRARY_VERSION "1.98"
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 0
#define NSS_BUILTINS_LIBRARY_VERSION "2.0"
/* These version numbers detail the semantic changes to the ckfw engine. */
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1

View File

@ -33,10 +33,10 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define NSS_VERSION "3.16.2" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VERSION "3.16.3" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 16
#define NSS_VPATCH 2
#define NSS_VPATCH 3
#define NSS_VBUILD 0
#define NSS_BETA PR_FALSE

View File

@ -25,10 +25,10 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define SOFTOKEN_VERSION "3.16.2" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VERSION "3.16.3" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 16
#define SOFTOKEN_VPATCH 2
#define SOFTOKEN_VPATCH 3
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_FALSE

View File

@ -19,10 +19,10 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
#define NSSUTIL_VERSION "3.16.2"
#define NSSUTIL_VERSION "3.16.3"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 16
#define NSSUTIL_VPATCH 2
#define NSSUTIL_VPATCH 3
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_FALSE