diff options
| author | kaie%netscape.com <devnull@localhost> | 2002-08-26 21:34:31 +0000 |
|---|---|---|
| committer | kaie%netscape.com <devnull@localhost> | 2002-08-26 21:34:31 +0000 |
| commit | 202694f509283ec7fa59ab41ae38dffb8101b2ce (patch) | |
| tree | 3c2db13f53765c89dc773a6c8a245edb1815458a /security/nss/lib/util | |
| parent | eefc36d22a2660a2f1bd94165c17ff13fc6bc2da (diff) | |
| download | nss-hg-202694f509283ec7fa59ab41ae38dffb8101b2ce.tar.gz | |
b=107034 OE requires special attribute in incoming signed messages to support dual key certificates. Add new function
NSS_CMSSignerInfo_AddMSSMIMEEncKeyPrefs.
r=relyea
Diffstat (limited to 'security/nss/lib/util')
| -rw-r--r-- | security/nss/lib/util/secoid.c | 9 | ||||
| -rw-r--r-- | security/nss/lib/util/secoidt.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/security/nss/lib/util/secoid.c b/security/nss/lib/util/secoid.c index 3339d1e86..179105488 100644 --- a/security/nss/lib/util/secoid.c +++ b/security/nss/lib/util/secoid.c @@ -148,6 +148,10 @@ #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 CONST_OID static const unsigned char CONST_OID md2[] = { DIGEST, 0x02 }; @@ -212,6 +216,7 @@ CONST_OID cmsRC2wrap[] = { PKCS9_SMIME_ALGS, 7 }; /* RFC2633 SMIME message attributes */ CONST_OID smimeEncryptionKeyPreference[] = { PKCS9_SMIME_ATTRS, 11 }; +CONST_OID ms_smimeEncryptionKeyPreference[] = { MICROSOFT_OID, 0x10, 0x4 }; CONST_OID x520CommonName[] = { X520_ATTRIBUTE_TYPE, 3 }; CONST_OID x520CountryName[] = { X520_ATTRIBUTE_TYPE, 6 }; @@ -1003,6 +1008,10 @@ const static SECOidData oids[] = { /* More bogus DSA OIDs */ OD( sdn702DSASignature, SEC_OID_SDN702_DSA_SIGNATURE, "SDN.702 DSA Signature", CKM_DSA_SHA1, INVALID_CERT_EXTENSION ), + + OD( ms_smimeEncryptionKeyPreference, SEC_OID_MS_SMIME_ENCRYPTION_KEY_PREFERENCE, + "Microsoft S/MIME Encryption Key Preference", + CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION ), }; /* diff --git a/security/nss/lib/util/secoidt.h b/security/nss/lib/util/secoidt.h index 7ce1f4cf4..5c89cf7a9 100644 --- a/security/nss/lib/util/secoidt.h +++ b/security/nss/lib/util/secoidt.h @@ -294,6 +294,8 @@ typedef enum { SEC_OID_SDN702_DSA_SIGNATURE = 189, + SEC_OID_MS_SMIME_ENCRYPTION_KEY_PREFERENCE = 190, + SEC_OID_TOTAL } SECOidTag; |