Update NSS to NSS_3_15_BETA2.

nss/lib/util/secoid.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "secoid.h"
 #include "pkcs11t.h"
 #include "secitem.h"
 #include "secerr.h"
 #include "prenv.h"
 #include "plhash.h"
@@ skipping 254 matching lines @@
 CONST_OID x520LocalityName[]                    = { X520_ATTRIBUTE_TYPE, 7 };
 CONST_OID x520StateOrProvinceName[]             = { X520_ATTRIBUTE_TYPE, 8 };
 CONST_OID x520StreetAddress[]                   = { X520_ATTRIBUTE_TYPE, 9 };
 CONST_OID x520OrgName[]                         = { X520_ATTRIBUTE_TYPE, 10 };
 CONST_OID x520OrgUnitName[]                     = { X520_ATTRIBUTE_TYPE, 11 };
 CONST_OID x520Title[]                           = { X520_ATTRIBUTE_TYPE, 12 };
 CONST_OID x520BusinessCategory[]                = { X520_ATTRIBUTE_TYPE, 15 };
 CONST_OID x520PostalAddress[]                   = { X520_ATTRIBUTE_TYPE, 16 };
 CONST_OID x520PostalCode[]                      = { X520_ATTRIBUTE_TYPE, 17 };
 CONST_OID x520PostOfficeBox[]                   = { X520_ATTRIBUTE_TYPE, 18 };
+CONST_OID x520Name[]                            = { X520_ATTRIBUTE_TYPE, 41 };
 CONST_OID x520GivenName[]                       = { X520_ATTRIBUTE_TYPE, 42 };
 CONST_OID x520Initials[]                        = { X520_ATTRIBUTE_TYPE, 43 };
 CONST_OID x520GenerationQualifier[]             = { X520_ATTRIBUTE_TYPE, 44 };
 CONST_OID x520DnQualifier[]                     = { X520_ATTRIBUTE_TYPE, 46 };
 CONST_OID x520HouseIdentifier[]                 = { X520_ATTRIBUTE_TYPE, 51 };
 CONST_OID x520Pseudonym[]                       = { X520_ATTRIBUTE_TYPE, 65 };
 
 CONST_OID nsTypeGIF[]                           = { NETSCAPE_DATA_TYPE, 0x01 };
 CONST_OID nsTypeJPEG[]                          = { NETSCAPE_DATA_TYPE, 0x02 };
 CONST_OID nsTypeURL[]                           = { NETSCAPE_DATA_TYPE, 0x03 };
@@ skipping 1353 matching lines @@
         SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST,
         "DSA with SHA-224 Signature",
         CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION),
     OD( nistDSASignaturewithSHA256Digest,
         SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST,
         "DSA with SHA-256 Signature",
         CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION),
     OD( msExtendedKeyUsageTrustListSigning, 
         SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING,
         "Microsoft Trust List Signing",
-        CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION )
+        CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
+    OD( x520Name, SEC_OID_AVA_NAME,
+        "X520 Name",    CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION )
 };
 
 /* PRIVATE EXTENDED SECOID Table
  * This table is private. Its structure is opaque to the outside.
  * It is indexed by the same SECOidTag as the oids table above.
  * Every member of this struct must have accessor functions (set, get)
  * and those functions must operate by value, not by reference.
  * The addresses of the contents of this table must not be exposed 
  * by the accessor functions.
  */
@@ skipping 526 matching lines @@
 void UTIL_SetForkState(PRBool forked)
 {
     parentForkedAfterC_Initialize = forked;
 }
 
 const char *
 NSSUTIL_GetVersion(void)
 {
     return NSSUTIL_VERSION;
 }