| Index: nss/mozilla/security/nss/lib/util/secoid.c
|
| ===================================================================
|
| --- nss/mozilla/security/nss/lib/util/secoid.c (revision 55475)
|
| +++ nss/mozilla/security/nss/lib/util/secoid.c (working copy)
|
| @@ -234,9 +234,14 @@
|
| 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 };
|
| @@ -1610,7 +1615,27 @@
|
|
|
| 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
|
|
|