Update to NSS 3.12.7 and NSPR 4.8.6....

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

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 25 matching lines @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef _SECOIDT_H_
 #define _SECOIDT_H_
 
 #include "utilrename.h"
 
 /*
  * secoidt.h - public data structures for ASN.1 OID functions
  *
- * $Id: secoidt.h,v 1.30 2009/04/14 02:04:08 alexei.volkov.bugs%sun.com Exp $
+ * $Id: secoidt.h,v 1.31 2010/05/28 01:26:07 wtc%google.com Exp $
  */
 
 #include "secitem.h"
 
 typedef struct SECOidDataStr SECOidData;
 typedef struct SECAlgorithmIDStr SECAlgorithmID;
 
 /*
 ** An X.500 algorithm identifier
 */
@@ skipping 386 matching lines @@
 
     SEC_OID_PKIX_TIMESTAMPING               = 299,
     SEC_OID_PKIX_CA_REPOSITORY              = 300,
 
     SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE     = 301,
 
     SEC_OID_SEED_CBC                        = 302,
 
     SEC_OID_X509_ANY_POLICY                 = 303,
 
+    SEC_OID_PKCS1_RSA_OAEP_ENCRYPTION       = 304,
+    SEC_OID_PKCS1_MGF1                      = 305,
+    SEC_OID_PKCS1_PSPECIFIED                = 306,
+    SEC_OID_PKCS1_RSA_PSS_SIGNATURE         = 307,
+    SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION = 308,
+
     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_ */