Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/util/secoidt.h

 /* 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/. */
 
 #ifndef _SECOIDT_H_
 #define _SECOIDT_H_
 
 #include "utilrename.h"
 
 /*
  * secoidt.h - public data structures for ASN.1 OID functions
  *
- * $Id: secoidt.h,v 1.36 2012/06/25 21:48:41 rrelyea%redhat.com Exp $
+ * $Id: secoidt.h,v 1.37 2012/12/19 02:10:42 emaldona%redhat.com Exp $
  */
 
 #include "secitem.h"
 
 typedef struct SECOidDataStr SECOidData;
 typedef struct SECAlgorithmIDStr SECAlgorithmID;
 
 /*
 ** An X.500 algorithm identifier
 */
@@ skipping 405 matching lines @@
     SEC_OID_SHA224                          = 309,
 
     SEC_OID_EV_INCORPORATION_LOCALITY       = 310,
     SEC_OID_EV_INCORPORATION_STATE          = 311,
     SEC_OID_EV_INCORPORATION_COUNTRY        = 312,
     SEC_OID_BUSINESS_CATEGORY               = 313,
 
     SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST     = 314,
     SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST     = 315,
 
+    /* Microsoft Trust List Signing
+     * szOID_KP_CTL_USAGE_SIGNING 
+     * where KP stands for Key Purpose
+     */
+    SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING    = 316,
+
     SEC_OID_TOTAL
 } SECOidTag;
 
 #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
 #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
 #define SEC_OID_PKCS12_KEY_USAGE  SEC_OID_X509_KEY_USAGE
 
 /* fake OID for DSS sign/verify */
 #define SEC_OID_SHA SEC_OID_MISS_DSS
 
@@ skipping 22 matching lines @@
 #define NSS_USE_ALG_IN_CMS_SIGNATURE   0x00000002  /* used in S/MIME */
 #define NSS_USE_ALG_RESERVED           0xfffffffc  /* may be used in future */
 
 /* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them
  * being all zeros or having any other known value.  The reserved bits
  * must be ignored.
  */
 
 
 #endif /* _SECOIDT_H_ */