diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-04-08 23:55:42 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-04-08 23:55:42 +0000 |
commit | d2e26dccd171143af09b4cd066c0cc7597ed2bef (patch) | |
tree | cea4a8d94984a2143bd24d5900db10ee74fb4a6f /crypto/objects | |
parent | acafc0b4ae452a5cee4e367b2b776338af0a4d4a (diff) |
Add PKCS#5 v2.0 ASN1 structures.
Diffstat (limited to 'crypto/objects')
-rw-r--r-- | crypto/objects/obj_dat.h | 20 | ||||
-rw-r--r-- | crypto/objects/objects.h | 12 |
2 files changed, 28 insertions, 4 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 7964a9fd31..12774fad25 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -61,12 +61,12 @@ * perl obj_dat.pl < objects.h > obj_dat.h */ -#define NUM_NID 161 +#define NUM_NID 164 #define NUM_SN 115 -#define NUM_LN 157 -#define NUM_OBJ 133 +#define NUM_LN 160 +#define NUM_OBJ 136 -static unsigned char lvalues[914]={ +static unsigned char lvalues[940]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -200,6 +200,9 @@ static unsigned char lvalues[914]={ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [883] OBJ_x509Certificate */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [893] OBJ_sdsiCertificate */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [903] OBJ_x509Crl */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [913] OBJ_pbes2 */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [922] OBJ_pbmac1 */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07, /* [931] OBJ_hmacWithSHA1 */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -428,6 +431,9 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"sdsiCertificate","sdsiCertificate",NID_sdsiCertificate,10, &(lvalues[893]),0}, {"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[903]),0}, +{"PBES2","PBES2",NID_pbes2,9,&(lvalues[913]),0}, +{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[922]),0}, +{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[931]),0}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ @@ -571,6 +577,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[73]),/* "Netscape Revocation Url" */ &(nid_objs[77]),/* "Netscape SSL Server Name" */ &(nid_objs[139]),/* "Netscape Server Gated Crypto" */ +&(nid_objs[161]),/* "PBES2" */ +&(nid_objs[162]),/* "PBMAC1" */ &(nid_objs[143]),/* "Strong Extranet ID" */ &(nid_objs[130]),/* "TLS Web Client Authentication" */ &(nid_objs[129]),/* "TLS Web Server Authentication" */ @@ -628,6 +636,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[56]),/* "extendedCertificateAttributes" */ &(nid_objs[156]),/* "friendlyName" */ &(nid_objs[99]),/* "givenName" */ +&(nid_objs[163]),/* "hmacWithSHA1" */ &(nid_objs[34]),/* "idea-cbc" */ &(nid_objs[35]),/* "idea-cfb" */ &(nid_objs[36]),/* "idea-ecb" */ @@ -773,6 +782,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[47]),/* OBJ_pkcs9 1 2 840 113549 1 9 */ &(nid_objs[ 3]),/* OBJ_md2 1 2 840 113549 2 2 */ &(nid_objs[ 4]),/* OBJ_md5 1 2 840 113549 2 5 */ +&(nid_objs[163]),/* OBJ_hmacWithSHA1 1 2 840 113549 2 7 */ &(nid_objs[37]),/* OBJ_rc2_cbc 1 2 840 113549 3 2 */ &(nid_objs[ 5]),/* OBJ_rc4 1 2 840 113549 3 4 */ &(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */ @@ -795,6 +805,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[10]),/* OBJ_pbeWithMD5AndDES_CBC 1 2 840 113549 1 5 3 */ &(nid_objs[68]),/* OBJ_pbeWithSHA1AndRC2_CBC 1 2 840 113549 1 5 11 */ &(nid_objs[69]),/* OBJ_pbeWithSHA1AndRC4 1 2 840 113549 1 5 12 */ +&(nid_objs[161]),/* OBJ_pbes2 1 2 840 113549 1 5 13 */ +&(nid_objs[162]),/* OBJ_pbmac1 1 2 840 113549 1 5 14 */ &(nid_objs[21]),/* OBJ_pkcs7_data 1 2 840 113549 1 7 1 */ &(nid_objs[22]),/* OBJ_pkcs7_signed 1 2 840 113549 1 7 2 */ &(nid_objs[23]),/* OBJ_pkcs7_enveloped 1 2 840 113549 1 7 3 */ diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h index 431d86e979..e9a8f47a83 100644 --- a/crypto/objects/objects.h +++ b/crypto/objects/objects.h @@ -840,7 +840,19 @@ extern "C" { #define NID_x509Crl 160 #define OBJ_x509Crl OBJ_crlTypes, 1L +/* PKCS#5 v2 OIDs */ +#define LN_pbes2 "PBES2" +#define NID_pbes2 161 +#define OBJ_pbes2 OBJ_pkcs,5L,13L + +#define LN_pbmac1 "PBMAC1" +#define NID_pbmac1 162 +#define OBJ_pbmac1 OBJ_pkcs,5L,14L + +#define LN_hmacWithSHA1 "hmacWithSHA1" +#define NID_hmacWithSHA1 163 +#define OBJ_hmacWithSHA1 OBJ_rsadsi,2L,7L #include "bio.h" #include "asn1.h" |