Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/util/secoid.c

 /* ***** 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 216 matching lines @@
 CONST_OID desede[]                           = { ALGORITHM, 0x11 };
 CONST_OID sha1[]                             = { ALGORITHM, 0x1a };
 CONST_OID bogusDSASignaturewithSHA1Digest[]  = { ALGORITHM, 0x1b };
 CONST_OID isoSHA1WithRSASignature[]          = { ALGORITHM, 0x1d };
 
 CONST_OID pkcs1RSAEncryption[]                  = { PKCS1, 0x01 };
 CONST_OID pkcs1MD2WithRSAEncryption[]           = { PKCS1, 0x02 };
 CONST_OID pkcs1MD4WithRSAEncryption[]           = { PKCS1, 0x03 };
 CONST_OID pkcs1MD5WithRSAEncryption[]           = { PKCS1, 0x04 };
 CONST_OID pkcs1SHA1WithRSAEncryption[]          = { PKCS1, 0x05 };
+CONST_OID pkcs1RSAOAEPEncryption[]              = { PKCS1, 0x07 };
+CONST_OID pkcs1MGF1[]                           = { PKCS1, 0x08 };
+CONST_OID pkcs1PSpecified[]                     = { PKCS1, 0x09 };
+CONST_OID pkcs1RSAPSSSignature[]                = { PKCS1, 10 };
 CONST_OID pkcs1SHA256WithRSAEncryption[]        = { PKCS1, 11 };
 CONST_OID pkcs1SHA384WithRSAEncryption[]        = { PKCS1, 12 };
 CONST_OID pkcs1SHA512WithRSAEncryption[]        = { PKCS1, 13 };
+CONST_OID pkcs1SHA224WithRSAEncryption[]        = { PKCS1, 14 };
 
 CONST_OID pkcs5PbeWithMD2AndDEScbc[]            = { PKCS5, 0x01 };
 CONST_OID pkcs5PbeWithMD5AndDEScbc[]            = { PKCS5, 0x03 };
 CONST_OID pkcs5PbeWithSha1AndDEScbc[]           = { PKCS5, 0x0a };
 CONST_OID pkcs5Pbkdf2[]                         = { PKCS5, 12 };
 CONST_OID pkcs5Pbes2[]                          = { PKCS5, 13 };
 CONST_OID pkcs5Pbmac1[]                         = { PKCS5, 14 };
 
 CONST_OID pkcs7[]                               = { PKCS7 };
 CONST_OID pkcs7Data[]                           = { PKCS7, 0x01 };
@@ skipping 1353 matching lines @@
     OD( isoSHA1WithRSASignature, SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE,
         "ISO SHA-1 with RSA Signature", 
         CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
 
     /* SEED algorithm OIDs */
     OD( seed_CBC, SEC_OID_SEED_CBC,
         "SEED-CBC", CKM_SEED_CBC, INVALID_CERT_EXTENSION),
 
     OD( x509CertificatePoliciesAnyPolicy, SEC_OID_X509_ANY_POLICY,
         "Certificate Policies AnyPolicy",
-        CKM_INVALID_MECHANISM, UNSUPPORTED_CERT_EXTENSION ),
+        CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
+
+    OD( pkcs1RSAOAEPEncryption, SEC_OID_PKCS1_RSA_OAEP_ENCRYPTION,
+        "PKCS #1 RSA-OAEP Encryption", CKM_RSA_PKCS_OAEP,
+        INVALID_CERT_EXTENSION ),
+
+    OD( pkcs1MGF1, SEC_OID_PKCS1_MGF1,
+        "PKCS #1 MGF1 Mask Generation Function", CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+
+    OD( pkcs1PSpecified, SEC_OID_PKCS1_PSPECIFIED,
+        "PKCS #1 RSA-OAEP Explicitly Specified Encoding Parameters",
+        CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ),
+
+    OD( pkcs1RSAPSSSignature, SEC_OID_PKCS1_RSA_PSS_SIGNATURE,
+        "PKCS #1 RSA-PSS Signature", CKM_RSA_PKCS_PSS,
+        INVALID_CERT_EXTENSION ),
+
+    OD( pkcs1SHA224WithRSAEncryption, SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION,
+        "PKCS #1 SHA-224 With RSA Encryption", CKM_SHA224_RSA_PKCS,
+        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 519 matching lines @@
     memset(xOids, 0, sizeof xOids);
     return SECSuccess;
 }
 
 void UTIL_SetForkState(PRBool forked)
 {
     parentForkedAfterC_Initialize = forked;
 }