Merge NSS_3_14_2_RTM.

mozilla/security/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 127 matching lines @@
 
 #define PKIX_ID_PKIP            PKIX, 5
 #define PKIX_ID_REGCTRL         PKIX_ID_PKIP, 1 
 #define PKIX_ID_REGINFO         PKIX_ID_PKIP, 2
 
 /* Microsoft Object ID space */
 /* { 1.3.6.1.4.1.311 } */
 #define MICROSOFT_OID 0x2b, 0x6, 0x1, 0x4, 0x1, 0x82, 0x37
 #define EV_NAME_ATTRIBUTE       MICROSOFT_OID, 60, 2, 1
 
+/* Microsoft Crypto 2.0 ID space */
+/* { 1.3.6.1.4.1.311.10 } */
+#define MS_CRYPTO_20            MICROSOFT_OID, 10
+/* Microsoft Crypto 2.0 Extended Key Usage ID space */
+/* { 1.3.6.1.4.1.311.10.3 } */
+#define MS_CRYPTO_EKU           MS_CRYPTO_20, 3
+
 #define CERTICOM_OID            0x2b, 0x81, 0x04
 #define SECG_OID                CERTICOM_OID, 0x00
 
 #define ANSI_X962_OID           0x2a, 0x86, 0x48, 0xce, 0x3d
 #define ANSI_X962_CURVE_OID     ANSI_X962_OID, 0x03
 #define ANSI_X962_GF2m_OID      ANSI_X962_CURVE_OID, 0x00
 #define ANSI_X962_GFp_OID       ANSI_X962_CURVE_OID, 0x01
 #define ANSI_X962_SIGNATURE_OID ANSI_X962_OID, 0x04
 #define ANSI_X962_SPECIFY_OID   ANSI_X962_SIGNATURE_OID, 0x03
 
@@ skipping 283 matching lines @@
 CONST_OID pkixRegCtrlProtEncKey[]               = { PKIX_ID_REGCTRL, 6};
 CONST_OID pkixRegInfoUTF8Pairs[]                = { PKIX_ID_REGINFO, 1};
 CONST_OID pkixRegInfoCertReq[]                  = { PKIX_ID_REGINFO, 2};
 
 CONST_OID pkixExtendedKeyUsageServerAuth[]      = { PKIX_KEY_USAGE, 1 };
 CONST_OID pkixExtendedKeyUsageClientAuth[]      = { PKIX_KEY_USAGE, 2 };
 CONST_OID pkixExtendedKeyUsageCodeSign[]        = { PKIX_KEY_USAGE, 3 };
 CONST_OID pkixExtendedKeyUsageEMailProtect[]    = { PKIX_KEY_USAGE, 4 };
 CONST_OID pkixExtendedKeyUsageTimeStamp[]       = { PKIX_KEY_USAGE, 8 };
 CONST_OID pkixOCSPResponderExtendedKeyUsage[]   = { PKIX_KEY_USAGE, 9 };
+CONST_OID msExtendedKeyUsageTrustListSigning[]  = { MS_CRYPTO_EKU, 1 };
 
 /* OIDs for Netscape defined algorithms */
 CONST_OID netscapeSMimeKEA[]                    = { NETSCAPE_ALGS, 0x01 };
 
 /* Fortezza algorithm OIDs */
 CONST_OID skipjackCBC[]                         = { MISSI, 0x04 };
 CONST_OID dhPublicKey[]                         = { ANSI_X942_ALGORITHM, 0x1 };
 
 CONST_OID aes128_ECB[]                          = { AES, 1 };
 CONST_OID aes128_CBC[]                          = { AES, 2 };
@@ skipping 1165 matching lines @@
         "Business Category",
         CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
 
     OD( nistDSASignaturewithSHA224Digest,
         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)
+        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 )
 };
 
 /* 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;
 }