Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added RFC2630 OID values:

Browse Source 
SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN = id-alg-ESDH
SEC_OID_CMS_3DES_KEY_WRAP                   = id-alg-CMS3DESwrap
SEC_OID_CMS_RC2_KEY_WRAP                    = id-alg-CMSRC2wrap
This commit is contained in:
chrisk%netscape.com 2000-05-22 15:28:22 +00:00
parent 8a40c748ac
commit cc9a75cd14
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
security/nss/lib/util/secoid.c
View File

@ -126,6 +126,8 @@
#define PKCS12_V2_PBE_IDS PKCS12, 0x01
#define PKCS9_CERT_TYPES PKCS9, 0x16
#define PKCS9_CRL_TYPES PKCS9, 0x17
#define PKCS9_SMIME_IDS PKCS9, 0x10
#define PKCS9_SMIME_ALGS PKCS9_SMIME_IDS, 3
#define PKCS12_VERSION1 PKCS12, 0x0a
#define PKCS12_V1_BAG_IDS PKCS12_VERSION1, 1
@ -384,6 +386,11 @@ static unsigned char netscapeNickname[] = { NETSCAPE_NAME_COMPONENTS, 0x01};
static unsigned char netscapeRecoveryRequest[] =
{ NETSCAPE_CERT_SERVER_CRMF, 0x01 };
/* RFC2630 (CMS) OIDs */
static unsigned char cmsESDH[] = { PKCS9_SMIME_ALGS, 5 };
static unsigned char cms3DESwrap[] = { PKCS9_SMIME_ALGS, 6 };
static unsigned char cmsRC2wrap[] = { PKCS9_SMIME_ALGS, 7 };
/*
* NOTE: the order of these entries must mach the SECOidTag enum in secoidt.h!
*/
@ -1181,6 +1188,23 @@ static SECOidData oids[] = {
SEC_OID_NS_CERT_EXT_SCOPE_OF_USE,
"Certificate Scope-of-Use Extension", CKM_INVALID_MECHANISM,
SUPPORTED_CERT_EXTENSION },
/* CMS stuff */
{ { siDEROID, cmsESDH,
sizeof(cmsESDH) },
SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN,
"Ephemeral-Static Diffie-Hellman", CKM_INVALID_MECHANISM /* XXX */,
INVALID_CERT_EXTENSION },
{ { siDEROID, cms3DESwrap,
sizeof(cms3DESwrap) },
SEC_OID_CMS_3DES_KEY_WRAP,
"CMS 3DES Key Wrap", CKM_INVALID_MECHANISM /* XXX */,
INVALID_CERT_EXTENSION },
{ { siDEROID, cmsRC2wrap,
sizeof(cmsRC2wrap) },
SEC_OID_CMS_RC2_KEY_WRAP,
"CMS RC2 Key Wrap", CKM_INVALID_MECHANISM /* XXX */,
INVALID_CERT_EXTENSION },
};
/*

7
security/nss/lib/util/secoidt.h
View File

@ -36,7 +36,7 @@
/*
* secoidt.h - public data structures for ASN.1 OID functions
*
* $Id: secoidt.h,v 1.1 2000/03/31 19:40:33 relyea%netscape.com Exp $
* $Id: secoidt.h,v 1.2 2000/05/22 15:28:22 chrisk%netscape.com Exp $
*/
#include "secitem.h"
@ -275,6 +275,11 @@ typedef enum {
/* New PSM certificate management OIDs */
SEC_OID_CERT_RENEWAL_LOCATOR,
SEC_OID_NS_CERT_EXT_SCOPE_OF_USE,
/* CMS (RFC2630) OIDs */
SEC_OID_CMS_EPHEMERAL_STATIC_DIFFIE_HELLMAN,
SEC_OID_CMS_3DES_KEY_WRAP,
SEC_OID_CMS_RC2_KEY_WRAP,
SEC_OID_TOTAL
} SECOidTag;