From 1862dae862e149cce5f9ef75a219419a52a4814a Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 1 Dec 2004 01:45:30 +0000 Subject: [PATCH 01/12] Perform partial comparison of different character types in X509_NAME_cmp(). --- CHANGES | 6 ++++++ crypto/x509/x509_cmp.c | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 47ffdcfde..9617f5212 100644 --- a/CHANGES +++ b/CHANGES @@ -745,6 +745,12 @@ Changes between 0.9.7e and 0.9.7f [XX xxx XXXX] + *) Perform some character comparisons of different types in X509_NAME_cmp: + this is needed for some certificates that reencode DNs into UTF8Strings + (in violation of RFC3280) and can't or wont issue name rollover + certificates. + [Steve Henson] + *) Make an explicit check during certificate validation to see that the CA setting in each certificate on the chain is correct. As a side effect always do the following basic checks on extensions, diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 5dfdcd41c..0d6bc653b 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -254,33 +254,49 @@ static int nocase_spacenorm_cmp(const ASN1_STRING *a, const ASN1_STRING *b) return 0; } +static int asn1_string_memcmp(ASN1_STRING *a, ASN1_STRING *b) + { + int j; + j = a->length - b->length; + if (j) + return j; + return memcmp(a->data, b->data, a->length); + } + +#define STR_TYPE_CMP (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_UTF8STRING) + int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) { int i,j; X509_NAME_ENTRY *na,*nb; - if (sk_X509_NAME_ENTRY_num(a->entries) - != sk_X509_NAME_ENTRY_num(b->entries)) - return sk_X509_NAME_ENTRY_num(a->entries) - -sk_X509_NAME_ENTRY_num(b->entries); + unsigned long nabit, nbbit; + + j = sk_X509_NAME_ENTRY_num(a->entries) + - sk_X509_NAME_ENTRY_num(b->entries); + if (j) + return j; for (i=sk_X509_NAME_ENTRY_num(a->entries)-1; i>=0; i--) { na=sk_X509_NAME_ENTRY_value(a->entries,i); nb=sk_X509_NAME_ENTRY_value(b->entries,i); j=na->value->type-nb->value->type; - if (j) return(j); - if (na->value->type == V_ASN1_PRINTABLESTRING) + if (j) + { + nabit = ASN1_tag2bit(na->value->type); + nbbit = ASN1_tag2bit(nb->value->type); + if (!(nabit & STR_TYPE_CMP) || + !(nbbit & STR_TYPE_CMP)) + return j; + j = asn1_string_memcmp(na->value, nb->value); + } + else if (na->value->type == V_ASN1_PRINTABLESTRING) j=nocase_spacenorm_cmp(na->value, nb->value); else if (na->value->type == V_ASN1_IA5STRING && OBJ_obj2nid(na->object) == NID_pkcs9_emailAddress) j=nocase_cmp(na->value, nb->value); else - { - j=na->value->length-nb->value->length; - if (j) return(j); - j=memcmp(na->value->data,nb->value->data, - na->value->length); - } + j = asn1_string_memcmp(na->value, nb->value); if (j) return(j); j=na->set-nb->set; if (j) return(j); From 7c69478064ffc1a17d8b7f44d06f813fc0f257b8 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 1 Dec 2004 15:28:18 +0000 Subject: [PATCH 02/12] I've introduced a bug to i386 RC4 assembler, which would emerge with certain mix of calls to RC4 routine not covered by rc4test.c. It's fixed now. In addition this patch inadvertently fixes minor performance problem: in 0.9.7 context P4 was performing 12% slower than the original implementation... --- crypto/rc4/asm/rc4-586.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/rc4/asm/rc4-586.pl b/crypto/rc4/asm/rc4-586.pl index 07b2bc6fc..d6e98f081 100644 --- a/crypto/rc4/asm/rc4-586.pl +++ b/crypto/rc4/asm/rc4-586.pl @@ -68,13 +68,13 @@ sub RC4_loop # &mov( $tx, &DWP(0,$d,$x,4)) if $p < 0; &add( &LB($y), &LB($tx)); - &inc( &LB($x)); # NEXT ROUND &mov( $ty, &DWP(0,$d,$y,4)); # XXX - &mov( &DWP(-4,$d,$x,4),$ty); # AGI + &mov( &DWP(0,$d,$x,4),$ty); &add( $ty, $tx); &mov( &DWP(0,$d,$y,4),$tx); &and( $ty, 0xff); + &inc( &LB($x)); # NEXT ROUND &mov( $tx, &DWP(0,$d,$x,4)) if $p < 1; # NEXT ROUND &mov( $ty, &DWP(0,$d,$ty,4)); From 8544a80776ff47a6095d2db2b8bbddeaa08cfbca Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 1 Dec 2004 18:09:53 +0000 Subject: [PATCH 03/12] Add couple of OIDs. Resync NIDs for consistency with 0.9.7. --- crypto/objects/obj_dat.h | 2391 ++++++++++++++++++------------------ crypto/objects/obj_mac.h | 488 ++++---- crypto/objects/obj_mac.num | 485 ++++---- crypto/objects/objects.txt | 2 + 4 files changed, 1693 insertions(+), 1673 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index ea9d9e8c9..7a5138276 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -62,12 +62,12 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 745 -#define NUM_SN 740 -#define NUM_LN 740 -#define NUM_OBJ 702 +#define NUM_NID 746 +#define NUM_SN 742 +#define NUM_LN 742 +#define NUM_OBJ 704 -static unsigned char lvalues[4957]={ +static unsigned char lvalues[4963]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -542,234 +542,236 @@ static unsigned char lvalues[4957]={ 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3813] OBJ_dITRedirect */ 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3823] OBJ_audio */ 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3833] OBJ_documentPublisher */ -0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03, /* [3843] OBJ_X9_62_id_characteristic_two_basis */ -0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [3851] OBJ_X9_62_onBasis */ -0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [3860] OBJ_X9_62_tpBasis */ -0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [3869] OBJ_X9_62_ppBasis */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01, /* [3878] OBJ_X9_62_c2pnb163v1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02, /* [3886] OBJ_X9_62_c2pnb163v2 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03, /* [3894] OBJ_X9_62_c2pnb163v3 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04, /* [3902] OBJ_X9_62_c2pnb176v1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05, /* [3910] OBJ_X9_62_c2tnb191v1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06, /* [3918] OBJ_X9_62_c2tnb191v2 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07, /* [3926] OBJ_X9_62_c2tnb191v3 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08, /* [3934] OBJ_X9_62_c2onb191v4 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09, /* [3942] OBJ_X9_62_c2onb191v5 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A, /* [3950] OBJ_X9_62_c2pnb208w1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B, /* [3958] OBJ_X9_62_c2tnb239v1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C, /* [3966] OBJ_X9_62_c2tnb239v2 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D, /* [3974] OBJ_X9_62_c2tnb239v3 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E, /* [3982] OBJ_X9_62_c2onb239v4 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F, /* [3990] OBJ_X9_62_c2onb239v5 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10, /* [3998] OBJ_X9_62_c2pnb272w1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11, /* [4006] OBJ_X9_62_c2pnb304w1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12, /* [4014] OBJ_X9_62_c2tnb359v1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13, /* [4022] OBJ_X9_62_c2pnb368w1 */ -0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14, /* [4030] OBJ_X9_62_c2tnb431r1 */ -0x2B, /* [4038] OBJ_identified_organization */ -0x2B,0x81,0x04, /* [4039] OBJ_certicom_arc */ -0x2B,0x81,0x04,0x00,0x06, /* [4042] OBJ_secp112r1 */ -0x2B,0x81,0x04,0x00,0x07, /* [4047] OBJ_secp112r2 */ -0x2B,0x81,0x04,0x00,0x1C, /* [4052] OBJ_secp128r1 */ -0x2B,0x81,0x04,0x00,0x1D, /* [4057] OBJ_secp128r2 */ -0x2B,0x81,0x04,0x00,0x09, /* [4062] OBJ_secp160k1 */ -0x2B,0x81,0x04,0x00,0x08, /* [4067] OBJ_secp160r1 */ -0x2B,0x81,0x04,0x00,0x1E, /* [4072] OBJ_secp160r2 */ -0x2B,0x81,0x04,0x00,0x1F, /* [4077] OBJ_secp192k1 */ -0x2B,0x81,0x04,0x00,0x20, /* [4082] OBJ_secp224k1 */ -0x2B,0x81,0x04,0x00,0x21, /* [4087] OBJ_secp224r1 */ -0x2B,0x81,0x04,0x00,0x0A, /* [4092] OBJ_secp256k1 */ -0x2B,0x81,0x04,0x00,0x22, /* [4097] OBJ_secp384r1 */ -0x2B,0x81,0x04,0x00,0x23, /* [4102] OBJ_secp521r1 */ -0x2B,0x81,0x04,0x00,0x04, /* [4107] OBJ_sect113r1 */ -0x2B,0x81,0x04,0x00,0x05, /* [4112] OBJ_sect113r2 */ -0x2B,0x81,0x04,0x00,0x16, /* [4117] OBJ_sect131r1 */ -0x2B,0x81,0x04,0x00,0x17, /* [4122] OBJ_sect131r2 */ -0x2B,0x81,0x04,0x00,0x01, /* [4127] OBJ_sect163k1 */ -0x2B,0x81,0x04,0x00,0x02, /* [4132] OBJ_sect163r1 */ -0x2B,0x81,0x04,0x00,0x0F, /* [4137] OBJ_sect163r2 */ -0x2B,0x81,0x04,0x00,0x18, /* [4142] OBJ_sect193r1 */ -0x2B,0x81,0x04,0x00,0x19, /* [4147] OBJ_sect193r2 */ -0x2B,0x81,0x04,0x00,0x1A, /* [4152] OBJ_sect233k1 */ -0x2B,0x81,0x04,0x00,0x1B, /* [4157] OBJ_sect233r1 */ -0x2B,0x81,0x04,0x00,0x03, /* [4162] OBJ_sect239k1 */ -0x2B,0x81,0x04,0x00,0x10, /* [4167] OBJ_sect283k1 */ -0x2B,0x81,0x04,0x00,0x11, /* [4172] OBJ_sect283r1 */ -0x2B,0x81,0x04,0x00,0x24, /* [4177] OBJ_sect409k1 */ -0x2B,0x81,0x04,0x00,0x25, /* [4182] OBJ_sect409r1 */ -0x2B,0x81,0x04,0x00,0x26, /* [4187] OBJ_sect571k1 */ -0x2B,0x81,0x04,0x00,0x27, /* [4192] OBJ_sect571r1 */ -0x67,0x2B, /* [4197] OBJ_wap */ -0x67,0x2B,0x0D, /* [4199] OBJ_wap_wsg */ -0x67,0x2B,0x0D,0x04,0x01, /* [4202] OBJ_wap_wsg_idm_ecid_wtls1 */ -0x67,0x2B,0x0D,0x04,0x06, /* [4207] OBJ_wap_wsg_idm_ecid_wtls6 */ -0x67,0x2B,0x0D,0x04,0x08, /* [4212] OBJ_wap_wsg_idm_ecid_wtls8 */ -0x67,0x2B,0x0D,0x04,0x09, /* [4217] OBJ_wap_wsg_idm_ecid_wtls9 */ -0x55,0x04,0x2D, /* [4222] OBJ_x500UniqueIdentifier */ -0x2B,0x06,0x01,0x07,0x01, /* [4225] OBJ_mime_mhs */ -0x2B,0x06,0x01,0x07,0x01,0x01, /* [4230] OBJ_mime_mhs_headings */ -0x2B,0x06,0x01,0x07,0x01,0x02, /* [4236] OBJ_mime_mhs_bodies */ -0x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [4242] OBJ_id_hex_partial_message */ -0x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [4249] OBJ_id_hex_multipart_message */ -0x55,0x04,0x2C, /* [4256] OBJ_generationQualifier */ -0x55,0x04,0x41, /* [4259] OBJ_pseudonym */ -0x67,0x2A, /* [4262] OBJ_id_set */ -0x67,0x2A,0x00, /* [4264] OBJ_set_ctype */ -0x67,0x2A,0x01, /* [4267] OBJ_set_msgExt */ -0x67,0x2A,0x03, /* [4270] OBJ_set_attr */ -0x67,0x2A,0x05, /* [4273] OBJ_set_policy */ -0x67,0x2A,0x07, /* [4276] OBJ_set_certExt */ -0x67,0x2A,0x08, /* [4279] OBJ_set_brand */ -0x67,0x2A,0x00,0x00, /* [4282] OBJ_setct_PANData */ -0x67,0x2A,0x00,0x01, /* [4286] OBJ_setct_PANToken */ -0x67,0x2A,0x00,0x02, /* [4290] OBJ_setct_PANOnly */ -0x67,0x2A,0x00,0x03, /* [4294] OBJ_setct_OIData */ -0x67,0x2A,0x00,0x04, /* [4298] OBJ_setct_PI */ -0x67,0x2A,0x00,0x05, /* [4302] OBJ_setct_PIData */ -0x67,0x2A,0x00,0x06, /* [4306] OBJ_setct_PIDataUnsigned */ -0x67,0x2A,0x00,0x07, /* [4310] OBJ_setct_HODInput */ -0x67,0x2A,0x00,0x08, /* [4314] OBJ_setct_AuthResBaggage */ -0x67,0x2A,0x00,0x09, /* [4318] OBJ_setct_AuthRevReqBaggage */ -0x67,0x2A,0x00,0x0A, /* [4322] OBJ_setct_AuthRevResBaggage */ -0x67,0x2A,0x00,0x0B, /* [4326] OBJ_setct_CapTokenSeq */ -0x67,0x2A,0x00,0x0C, /* [4330] OBJ_setct_PInitResData */ -0x67,0x2A,0x00,0x0D, /* [4334] OBJ_setct_PI_TBS */ -0x67,0x2A,0x00,0x0E, /* [4338] OBJ_setct_PResData */ -0x67,0x2A,0x00,0x10, /* [4342] OBJ_setct_AuthReqTBS */ -0x67,0x2A,0x00,0x11, /* [4346] OBJ_setct_AuthResTBS */ -0x67,0x2A,0x00,0x12, /* [4350] OBJ_setct_AuthResTBSX */ -0x67,0x2A,0x00,0x13, /* [4354] OBJ_setct_AuthTokenTBS */ -0x67,0x2A,0x00,0x14, /* [4358] OBJ_setct_CapTokenData */ -0x67,0x2A,0x00,0x15, /* [4362] OBJ_setct_CapTokenTBS */ -0x67,0x2A,0x00,0x16, /* [4366] OBJ_setct_AcqCardCodeMsg */ -0x67,0x2A,0x00,0x17, /* [4370] OBJ_setct_AuthRevReqTBS */ -0x67,0x2A,0x00,0x18, /* [4374] OBJ_setct_AuthRevResData */ -0x67,0x2A,0x00,0x19, /* [4378] OBJ_setct_AuthRevResTBS */ -0x67,0x2A,0x00,0x1A, /* [4382] OBJ_setct_CapReqTBS */ -0x67,0x2A,0x00,0x1B, /* [4386] OBJ_setct_CapReqTBSX */ -0x67,0x2A,0x00,0x1C, /* [4390] OBJ_setct_CapResData */ -0x67,0x2A,0x00,0x1D, /* [4394] OBJ_setct_CapRevReqTBS */ -0x67,0x2A,0x00,0x1E, /* [4398] OBJ_setct_CapRevReqTBSX */ -0x67,0x2A,0x00,0x1F, /* [4402] OBJ_setct_CapRevResData */ -0x67,0x2A,0x00,0x20, /* [4406] OBJ_setct_CredReqTBS */ -0x67,0x2A,0x00,0x21, /* [4410] OBJ_setct_CredReqTBSX */ -0x67,0x2A,0x00,0x22, /* [4414] OBJ_setct_CredResData */ -0x67,0x2A,0x00,0x23, /* [4418] OBJ_setct_CredRevReqTBS */ -0x67,0x2A,0x00,0x24, /* [4422] OBJ_setct_CredRevReqTBSX */ -0x67,0x2A,0x00,0x25, /* [4426] OBJ_setct_CredRevResData */ -0x67,0x2A,0x00,0x26, /* [4430] OBJ_setct_PCertReqData */ -0x67,0x2A,0x00,0x27, /* [4434] OBJ_setct_PCertResTBS */ -0x67,0x2A,0x00,0x28, /* [4438] OBJ_setct_BatchAdminReqData */ -0x67,0x2A,0x00,0x29, /* [4442] OBJ_setct_BatchAdminResData */ -0x67,0x2A,0x00,0x2A, /* [4446] OBJ_setct_CardCInitResTBS */ -0x67,0x2A,0x00,0x2B, /* [4450] OBJ_setct_MeAqCInitResTBS */ -0x67,0x2A,0x00,0x2C, /* [4454] OBJ_setct_RegFormResTBS */ -0x67,0x2A,0x00,0x2D, /* [4458] OBJ_setct_CertReqData */ -0x67,0x2A,0x00,0x2E, /* [4462] OBJ_setct_CertReqTBS */ -0x67,0x2A,0x00,0x2F, /* [4466] OBJ_setct_CertResData */ -0x67,0x2A,0x00,0x30, /* [4470] OBJ_setct_CertInqReqTBS */ -0x67,0x2A,0x00,0x31, /* [4474] OBJ_setct_ErrorTBS */ -0x67,0x2A,0x00,0x32, /* [4478] OBJ_setct_PIDualSignedTBE */ -0x67,0x2A,0x00,0x33, /* [4482] OBJ_setct_PIUnsignedTBE */ -0x67,0x2A,0x00,0x34, /* [4486] OBJ_setct_AuthReqTBE */ -0x67,0x2A,0x00,0x35, /* [4490] OBJ_setct_AuthResTBE */ -0x67,0x2A,0x00,0x36, /* [4494] OBJ_setct_AuthResTBEX */ -0x67,0x2A,0x00,0x37, /* [4498] OBJ_setct_AuthTokenTBE */ -0x67,0x2A,0x00,0x38, /* [4502] OBJ_setct_CapTokenTBE */ -0x67,0x2A,0x00,0x39, /* [4506] OBJ_setct_CapTokenTBEX */ -0x67,0x2A,0x00,0x3A, /* [4510] OBJ_setct_AcqCardCodeMsgTBE */ -0x67,0x2A,0x00,0x3B, /* [4514] OBJ_setct_AuthRevReqTBE */ -0x67,0x2A,0x00,0x3C, /* [4518] OBJ_setct_AuthRevResTBE */ -0x67,0x2A,0x00,0x3D, /* [4522] OBJ_setct_AuthRevResTBEB */ -0x67,0x2A,0x00,0x3E, /* [4526] OBJ_setct_CapReqTBE */ -0x67,0x2A,0x00,0x3F, /* [4530] OBJ_setct_CapReqTBEX */ -0x67,0x2A,0x00,0x40, /* [4534] OBJ_setct_CapResTBE */ -0x67,0x2A,0x00,0x41, /* [4538] OBJ_setct_CapRevReqTBE */ -0x67,0x2A,0x00,0x42, /* [4542] OBJ_setct_CapRevReqTBEX */ -0x67,0x2A,0x00,0x43, /* [4546] OBJ_setct_CapRevResTBE */ -0x67,0x2A,0x00,0x44, /* [4550] OBJ_setct_CredReqTBE */ -0x67,0x2A,0x00,0x45, /* [4554] OBJ_setct_CredReqTBEX */ -0x67,0x2A,0x00,0x46, /* [4558] OBJ_setct_CredResTBE */ -0x67,0x2A,0x00,0x47, /* [4562] OBJ_setct_CredRevReqTBE */ -0x67,0x2A,0x00,0x48, /* [4566] OBJ_setct_CredRevReqTBEX */ -0x67,0x2A,0x00,0x49, /* [4570] OBJ_setct_CredRevResTBE */ -0x67,0x2A,0x00,0x4A, /* [4574] OBJ_setct_BatchAdminReqTBE */ -0x67,0x2A,0x00,0x4B, /* [4578] OBJ_setct_BatchAdminResTBE */ -0x67,0x2A,0x00,0x4C, /* [4582] OBJ_setct_RegFormReqTBE */ -0x67,0x2A,0x00,0x4D, /* [4586] OBJ_setct_CertReqTBE */ -0x67,0x2A,0x00,0x4E, /* [4590] OBJ_setct_CertReqTBEX */ -0x67,0x2A,0x00,0x4F, /* [4594] OBJ_setct_CertResTBE */ -0x67,0x2A,0x00,0x50, /* [4598] OBJ_setct_CRLNotificationTBS */ -0x67,0x2A,0x00,0x51, /* [4602] OBJ_setct_CRLNotificationResTBS */ -0x67,0x2A,0x00,0x52, /* [4606] OBJ_setct_BCIDistributionTBS */ -0x67,0x2A,0x01,0x01, /* [4610] OBJ_setext_genCrypt */ -0x67,0x2A,0x01,0x03, /* [4614] OBJ_setext_miAuth */ -0x67,0x2A,0x01,0x04, /* [4618] OBJ_setext_pinSecure */ -0x67,0x2A,0x01,0x05, /* [4622] OBJ_setext_pinAny */ -0x67,0x2A,0x01,0x07, /* [4626] OBJ_setext_track2 */ -0x67,0x2A,0x01,0x08, /* [4630] OBJ_setext_cv */ -0x67,0x2A,0x05,0x00, /* [4634] OBJ_set_policy_root */ -0x67,0x2A,0x07,0x00, /* [4638] OBJ_setCext_hashedRoot */ -0x67,0x2A,0x07,0x01, /* [4642] OBJ_setCext_certType */ -0x67,0x2A,0x07,0x02, /* [4646] OBJ_setCext_merchData */ -0x67,0x2A,0x07,0x03, /* [4650] OBJ_setCext_cCertRequired */ -0x67,0x2A,0x07,0x04, /* [4654] OBJ_setCext_tunneling */ -0x67,0x2A,0x07,0x05, /* [4658] OBJ_setCext_setExt */ -0x67,0x2A,0x07,0x06, /* [4662] OBJ_setCext_setQualf */ -0x67,0x2A,0x07,0x07, /* [4666] OBJ_setCext_PGWYcapabilities */ -0x67,0x2A,0x07,0x08, /* [4670] OBJ_setCext_TokenIdentifier */ -0x67,0x2A,0x07,0x09, /* [4674] OBJ_setCext_Track2Data */ -0x67,0x2A,0x07,0x0A, /* [4678] OBJ_setCext_TokenType */ -0x67,0x2A,0x07,0x0B, /* [4682] OBJ_setCext_IssuerCapabilities */ -0x67,0x2A,0x03,0x00, /* [4686] OBJ_setAttr_Cert */ -0x67,0x2A,0x03,0x01, /* [4690] OBJ_setAttr_PGWYcap */ -0x67,0x2A,0x03,0x02, /* [4694] OBJ_setAttr_TokenType */ -0x67,0x2A,0x03,0x03, /* [4698] OBJ_setAttr_IssCap */ -0x67,0x2A,0x03,0x00,0x00, /* [4702] OBJ_set_rootKeyThumb */ -0x67,0x2A,0x03,0x00,0x01, /* [4707] OBJ_set_addPolicy */ -0x67,0x2A,0x03,0x02,0x01, /* [4712] OBJ_setAttr_Token_EMV */ -0x67,0x2A,0x03,0x02,0x02, /* [4717] OBJ_setAttr_Token_B0Prime */ -0x67,0x2A,0x03,0x03,0x03, /* [4722] OBJ_setAttr_IssCap_CVM */ -0x67,0x2A,0x03,0x03,0x04, /* [4727] OBJ_setAttr_IssCap_T2 */ -0x67,0x2A,0x03,0x03,0x05, /* [4732] OBJ_setAttr_IssCap_Sig */ -0x67,0x2A,0x03,0x03,0x03,0x01, /* [4737] OBJ_setAttr_GenCryptgrm */ -0x67,0x2A,0x03,0x03,0x04,0x01, /* [4743] OBJ_setAttr_T2Enc */ -0x67,0x2A,0x03,0x03,0x04,0x02, /* [4749] OBJ_setAttr_T2cleartxt */ -0x67,0x2A,0x03,0x03,0x05,0x01, /* [4755] OBJ_setAttr_TokICCsig */ -0x67,0x2A,0x03,0x03,0x05,0x02, /* [4761] OBJ_setAttr_SecDevSig */ -0x67,0x2A,0x08,0x01, /* [4767] OBJ_set_brand_IATA_ATA */ -0x67,0x2A,0x08,0x1E, /* [4771] OBJ_set_brand_Diners */ -0x67,0x2A,0x08,0x22, /* [4775] OBJ_set_brand_AmericanExpress */ -0x67,0x2A,0x08,0x23, /* [4779] OBJ_set_brand_JCB */ -0x67,0x2A,0x08,0x04, /* [4783] OBJ_set_brand_Visa */ -0x67,0x2A,0x08,0x05, /* [4787] OBJ_set_brand_MasterCard */ -0x67,0x2A,0x08,0xAE,0x7B, /* [4791] OBJ_set_brand_Novus */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4796] OBJ_des_cdmf */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4804] OBJ_rsaOAEPEncryptionSET */ -0x67,0x2B,0x0D,0x04,0x03, /* [4813] OBJ_wap_wsg_idm_ecid_wtls3 */ -0x67,0x2B,0x0D,0x04,0x04, /* [4818] OBJ_wap_wsg_idm_ecid_wtls4 */ -0x67,0x2B,0x0D,0x04,0x05, /* [4823] OBJ_wap_wsg_idm_ecid_wtls5 */ -0x67,0x2B,0x0D,0x04,0x07, /* [4828] OBJ_wap_wsg_idm_ecid_wtls7 */ -0x67,0x2B,0x0D,0x04,0x0A, /* [4833] OBJ_wap_wsg_idm_ecid_wtls10 */ -0x67,0x2B,0x0D,0x04,0x0B, /* [4838] OBJ_wap_wsg_idm_ecid_wtls11 */ -0x67,0x2B,0x0D,0x04,0x0C, /* [4843] OBJ_wap_wsg_idm_ecid_wtls12 */ -0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4848] OBJ_ms_smartcard_login */ -0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4858] OBJ_ms_upn */ -0x55,0x1D,0x20,0x00, /* [4868] OBJ_any_policy */ -0x55,0x1D,0x21, /* [4872] OBJ_policy_mappings */ -0x55,0x1D,0x1E, /* [4875] OBJ_name_constraints */ -0x00, /* [4878] OBJ_itu_t */ -0x50, /* [4879] OBJ_joint_iso_itu_t */ -0x67, /* [4880] OBJ_international_organizations */ -0x55,0x1D,0x36, /* [4881] OBJ_inhibit_any_policy */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4884] OBJ_sha256WithRSAEncryption */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4893] OBJ_sha384WithRSAEncryption */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4902] OBJ_sha512WithRSAEncryption */ -0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4911] OBJ_sha224WithRSAEncryption */ -0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4920] OBJ_sha256 */ -0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4929] OBJ_sha384 */ -0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4938] OBJ_sha512 */ -0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4947] OBJ_sha224 */ +0x55,0x04,0x2D, /* [3843] OBJ_x500UniqueIdentifier */ +0x2B,0x06,0x01,0x07,0x01, /* [3846] OBJ_mime_mhs */ +0x2B,0x06,0x01,0x07,0x01,0x01, /* [3851] OBJ_mime_mhs_headings */ +0x2B,0x06,0x01,0x07,0x01,0x02, /* [3857] OBJ_mime_mhs_bodies */ +0x2B,0x06,0x01,0x07,0x01,0x01,0x01, /* [3863] OBJ_id_hex_partial_message */ +0x2B,0x06,0x01,0x07,0x01,0x01,0x02, /* [3870] OBJ_id_hex_multipart_message */ +0x55,0x04,0x2C, /* [3877] OBJ_generationQualifier */ +0x55,0x04,0x41, /* [3880] OBJ_pseudonym */ +0x67,0x2A, /* [3883] OBJ_id_set */ +0x67,0x2A,0x00, /* [3885] OBJ_set_ctype */ +0x67,0x2A,0x01, /* [3888] OBJ_set_msgExt */ +0x67,0x2A,0x03, /* [3891] OBJ_set_attr */ +0x67,0x2A,0x05, /* [3894] OBJ_set_policy */ +0x67,0x2A,0x07, /* [3897] OBJ_set_certExt */ +0x67,0x2A,0x08, /* [3900] OBJ_set_brand */ +0x67,0x2A,0x00,0x00, /* [3903] OBJ_setct_PANData */ +0x67,0x2A,0x00,0x01, /* [3907] OBJ_setct_PANToken */ +0x67,0x2A,0x00,0x02, /* [3911] OBJ_setct_PANOnly */ +0x67,0x2A,0x00,0x03, /* [3915] OBJ_setct_OIData */ +0x67,0x2A,0x00,0x04, /* [3919] OBJ_setct_PI */ +0x67,0x2A,0x00,0x05, /* [3923] OBJ_setct_PIData */ +0x67,0x2A,0x00,0x06, /* [3927] OBJ_setct_PIDataUnsigned */ +0x67,0x2A,0x00,0x07, /* [3931] OBJ_setct_HODInput */ +0x67,0x2A,0x00,0x08, /* [3935] OBJ_setct_AuthResBaggage */ +0x67,0x2A,0x00,0x09, /* [3939] OBJ_setct_AuthRevReqBaggage */ +0x67,0x2A,0x00,0x0A, /* [3943] OBJ_setct_AuthRevResBaggage */ +0x67,0x2A,0x00,0x0B, /* [3947] OBJ_setct_CapTokenSeq */ +0x67,0x2A,0x00,0x0C, /* [3951] OBJ_setct_PInitResData */ +0x67,0x2A,0x00,0x0D, /* [3955] OBJ_setct_PI_TBS */ +0x67,0x2A,0x00,0x0E, /* [3959] OBJ_setct_PResData */ +0x67,0x2A,0x00,0x10, /* [3963] OBJ_setct_AuthReqTBS */ +0x67,0x2A,0x00,0x11, /* [3967] OBJ_setct_AuthResTBS */ +0x67,0x2A,0x00,0x12, /* [3971] OBJ_setct_AuthResTBSX */ +0x67,0x2A,0x00,0x13, /* [3975] OBJ_setct_AuthTokenTBS */ +0x67,0x2A,0x00,0x14, /* [3979] OBJ_setct_CapTokenData */ +0x67,0x2A,0x00,0x15, /* [3983] OBJ_setct_CapTokenTBS */ +0x67,0x2A,0x00,0x16, /* [3987] OBJ_setct_AcqCardCodeMsg */ +0x67,0x2A,0x00,0x17, /* [3991] OBJ_setct_AuthRevReqTBS */ +0x67,0x2A,0x00,0x18, /* [3995] OBJ_setct_AuthRevResData */ +0x67,0x2A,0x00,0x19, /* [3999] OBJ_setct_AuthRevResTBS */ +0x67,0x2A,0x00,0x1A, /* [4003] OBJ_setct_CapReqTBS */ +0x67,0x2A,0x00,0x1B, /* [4007] OBJ_setct_CapReqTBSX */ +0x67,0x2A,0x00,0x1C, /* [4011] OBJ_setct_CapResData */ +0x67,0x2A,0x00,0x1D, /* [4015] OBJ_setct_CapRevReqTBS */ +0x67,0x2A,0x00,0x1E, /* [4019] OBJ_setct_CapRevReqTBSX */ +0x67,0x2A,0x00,0x1F, /* [4023] OBJ_setct_CapRevResData */ +0x67,0x2A,0x00,0x20, /* [4027] OBJ_setct_CredReqTBS */ +0x67,0x2A,0x00,0x21, /* [4031] OBJ_setct_CredReqTBSX */ +0x67,0x2A,0x00,0x22, /* [4035] OBJ_setct_CredResData */ +0x67,0x2A,0x00,0x23, /* [4039] OBJ_setct_CredRevReqTBS */ +0x67,0x2A,0x00,0x24, /* [4043] OBJ_setct_CredRevReqTBSX */ +0x67,0x2A,0x00,0x25, /* [4047] OBJ_setct_CredRevResData */ +0x67,0x2A,0x00,0x26, /* [4051] OBJ_setct_PCertReqData */ +0x67,0x2A,0x00,0x27, /* [4055] OBJ_setct_PCertResTBS */ +0x67,0x2A,0x00,0x28, /* [4059] OBJ_setct_BatchAdminReqData */ +0x67,0x2A,0x00,0x29, /* [4063] OBJ_setct_BatchAdminResData */ +0x67,0x2A,0x00,0x2A, /* [4067] OBJ_setct_CardCInitResTBS */ +0x67,0x2A,0x00,0x2B, /* [4071] OBJ_setct_MeAqCInitResTBS */ +0x67,0x2A,0x00,0x2C, /* [4075] OBJ_setct_RegFormResTBS */ +0x67,0x2A,0x00,0x2D, /* [4079] OBJ_setct_CertReqData */ +0x67,0x2A,0x00,0x2E, /* [4083] OBJ_setct_CertReqTBS */ +0x67,0x2A,0x00,0x2F, /* [4087] OBJ_setct_CertResData */ +0x67,0x2A,0x00,0x30, /* [4091] OBJ_setct_CertInqReqTBS */ +0x67,0x2A,0x00,0x31, /* [4095] OBJ_setct_ErrorTBS */ +0x67,0x2A,0x00,0x32, /* [4099] OBJ_setct_PIDualSignedTBE */ +0x67,0x2A,0x00,0x33, /* [4103] OBJ_setct_PIUnsignedTBE */ +0x67,0x2A,0x00,0x34, /* [4107] OBJ_setct_AuthReqTBE */ +0x67,0x2A,0x00,0x35, /* [4111] OBJ_setct_AuthResTBE */ +0x67,0x2A,0x00,0x36, /* [4115] OBJ_setct_AuthResTBEX */ +0x67,0x2A,0x00,0x37, /* [4119] OBJ_setct_AuthTokenTBE */ +0x67,0x2A,0x00,0x38, /* [4123] OBJ_setct_CapTokenTBE */ +0x67,0x2A,0x00,0x39, /* [4127] OBJ_setct_CapTokenTBEX */ +0x67,0x2A,0x00,0x3A, /* [4131] OBJ_setct_AcqCardCodeMsgTBE */ +0x67,0x2A,0x00,0x3B, /* [4135] OBJ_setct_AuthRevReqTBE */ +0x67,0x2A,0x00,0x3C, /* [4139] OBJ_setct_AuthRevResTBE */ +0x67,0x2A,0x00,0x3D, /* [4143] OBJ_setct_AuthRevResTBEB */ +0x67,0x2A,0x00,0x3E, /* [4147] OBJ_setct_CapReqTBE */ +0x67,0x2A,0x00,0x3F, /* [4151] OBJ_setct_CapReqTBEX */ +0x67,0x2A,0x00,0x40, /* [4155] OBJ_setct_CapResTBE */ +0x67,0x2A,0x00,0x41, /* [4159] OBJ_setct_CapRevReqTBE */ +0x67,0x2A,0x00,0x42, /* [4163] OBJ_setct_CapRevReqTBEX */ +0x67,0x2A,0x00,0x43, /* [4167] OBJ_setct_CapRevResTBE */ +0x67,0x2A,0x00,0x44, /* [4171] OBJ_setct_CredReqTBE */ +0x67,0x2A,0x00,0x45, /* [4175] OBJ_setct_CredReqTBEX */ +0x67,0x2A,0x00,0x46, /* [4179] OBJ_setct_CredResTBE */ +0x67,0x2A,0x00,0x47, /* [4183] OBJ_setct_CredRevReqTBE */ +0x67,0x2A,0x00,0x48, /* [4187] OBJ_setct_CredRevReqTBEX */ +0x67,0x2A,0x00,0x49, /* [4191] OBJ_setct_CredRevResTBE */ +0x67,0x2A,0x00,0x4A, /* [4195] OBJ_setct_BatchAdminReqTBE */ +0x67,0x2A,0x00,0x4B, /* [4199] OBJ_setct_BatchAdminResTBE */ +0x67,0x2A,0x00,0x4C, /* [4203] OBJ_setct_RegFormReqTBE */ +0x67,0x2A,0x00,0x4D, /* [4207] OBJ_setct_CertReqTBE */ +0x67,0x2A,0x00,0x4E, /* [4211] OBJ_setct_CertReqTBEX */ +0x67,0x2A,0x00,0x4F, /* [4215] OBJ_setct_CertResTBE */ +0x67,0x2A,0x00,0x50, /* [4219] OBJ_setct_CRLNotificationTBS */ +0x67,0x2A,0x00,0x51, /* [4223] OBJ_setct_CRLNotificationResTBS */ +0x67,0x2A,0x00,0x52, /* [4227] OBJ_setct_BCIDistributionTBS */ +0x67,0x2A,0x01,0x01, /* [4231] OBJ_setext_genCrypt */ +0x67,0x2A,0x01,0x03, /* [4235] OBJ_setext_miAuth */ +0x67,0x2A,0x01,0x04, /* [4239] OBJ_setext_pinSecure */ +0x67,0x2A,0x01,0x05, /* [4243] OBJ_setext_pinAny */ +0x67,0x2A,0x01,0x07, /* [4247] OBJ_setext_track2 */ +0x67,0x2A,0x01,0x08, /* [4251] OBJ_setext_cv */ +0x67,0x2A,0x05,0x00, /* [4255] OBJ_set_policy_root */ +0x67,0x2A,0x07,0x00, /* [4259] OBJ_setCext_hashedRoot */ +0x67,0x2A,0x07,0x01, /* [4263] OBJ_setCext_certType */ +0x67,0x2A,0x07,0x02, /* [4267] OBJ_setCext_merchData */ +0x67,0x2A,0x07,0x03, /* [4271] OBJ_setCext_cCertRequired */ +0x67,0x2A,0x07,0x04, /* [4275] OBJ_setCext_tunneling */ +0x67,0x2A,0x07,0x05, /* [4279] OBJ_setCext_setExt */ +0x67,0x2A,0x07,0x06, /* [4283] OBJ_setCext_setQualf */ +0x67,0x2A,0x07,0x07, /* [4287] OBJ_setCext_PGWYcapabilities */ +0x67,0x2A,0x07,0x08, /* [4291] OBJ_setCext_TokenIdentifier */ +0x67,0x2A,0x07,0x09, /* [4295] OBJ_setCext_Track2Data */ +0x67,0x2A,0x07,0x0A, /* [4299] OBJ_setCext_TokenType */ +0x67,0x2A,0x07,0x0B, /* [4303] OBJ_setCext_IssuerCapabilities */ +0x67,0x2A,0x03,0x00, /* [4307] OBJ_setAttr_Cert */ +0x67,0x2A,0x03,0x01, /* [4311] OBJ_setAttr_PGWYcap */ +0x67,0x2A,0x03,0x02, /* [4315] OBJ_setAttr_TokenType */ +0x67,0x2A,0x03,0x03, /* [4319] OBJ_setAttr_IssCap */ +0x67,0x2A,0x03,0x00,0x00, /* [4323] OBJ_set_rootKeyThumb */ +0x67,0x2A,0x03,0x00,0x01, /* [4328] OBJ_set_addPolicy */ +0x67,0x2A,0x03,0x02,0x01, /* [4333] OBJ_setAttr_Token_EMV */ +0x67,0x2A,0x03,0x02,0x02, /* [4338] OBJ_setAttr_Token_B0Prime */ +0x67,0x2A,0x03,0x03,0x03, /* [4343] OBJ_setAttr_IssCap_CVM */ +0x67,0x2A,0x03,0x03,0x04, /* [4348] OBJ_setAttr_IssCap_T2 */ +0x67,0x2A,0x03,0x03,0x05, /* [4353] OBJ_setAttr_IssCap_Sig */ +0x67,0x2A,0x03,0x03,0x03,0x01, /* [4358] OBJ_setAttr_GenCryptgrm */ +0x67,0x2A,0x03,0x03,0x04,0x01, /* [4364] OBJ_setAttr_T2Enc */ +0x67,0x2A,0x03,0x03,0x04,0x02, /* [4370] OBJ_setAttr_T2cleartxt */ +0x67,0x2A,0x03,0x03,0x05,0x01, /* [4376] OBJ_setAttr_TokICCsig */ +0x67,0x2A,0x03,0x03,0x05,0x02, /* [4382] OBJ_setAttr_SecDevSig */ +0x67,0x2A,0x08,0x01, /* [4388] OBJ_set_brand_IATA_ATA */ +0x67,0x2A,0x08,0x1E, /* [4392] OBJ_set_brand_Diners */ +0x67,0x2A,0x08,0x22, /* [4396] OBJ_set_brand_AmericanExpress */ +0x67,0x2A,0x08,0x23, /* [4400] OBJ_set_brand_JCB */ +0x67,0x2A,0x08,0x04, /* [4404] OBJ_set_brand_Visa */ +0x67,0x2A,0x08,0x05, /* [4408] OBJ_set_brand_MasterCard */ +0x67,0x2A,0x08,0xAE,0x7B, /* [4412] OBJ_set_brand_Novus */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4417] OBJ_des_cdmf */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4425] OBJ_rsaOAEPEncryptionSET */ +0x00, /* [4434] OBJ_itu_t */ +0x50, /* [4435] OBJ_joint_iso_itu_t */ +0x67, /* [4436] OBJ_international_organizations */ +0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4437] OBJ_ms_smartcard_login */ +0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4447] OBJ_ms_upn */ +0x55,0x04,0x09, /* [4457] OBJ_streetAddress */ +0x55,0x04,0x11, /* [4460] OBJ_postalCode */ +0x2B, /* [4463] OBJ_identified_organization */ +0x2B,0x81,0x04, /* [4464] OBJ_certicom_arc */ +0x67,0x2B, /* [4467] OBJ_wap */ +0x67,0x2B,0x0D, /* [4469] OBJ_wap_wsg */ +0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03, /* [4472] OBJ_X9_62_id_characteristic_two_basis */ +0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [4480] OBJ_X9_62_onBasis */ +0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [4489] OBJ_X9_62_tpBasis */ +0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [4498] OBJ_X9_62_ppBasis */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01, /* [4507] OBJ_X9_62_c2pnb163v1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02, /* [4515] OBJ_X9_62_c2pnb163v2 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03, /* [4523] OBJ_X9_62_c2pnb163v3 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04, /* [4531] OBJ_X9_62_c2pnb176v1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05, /* [4539] OBJ_X9_62_c2tnb191v1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06, /* [4547] OBJ_X9_62_c2tnb191v2 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07, /* [4555] OBJ_X9_62_c2tnb191v3 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08, /* [4563] OBJ_X9_62_c2onb191v4 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09, /* [4571] OBJ_X9_62_c2onb191v5 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A, /* [4579] OBJ_X9_62_c2pnb208w1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B, /* [4587] OBJ_X9_62_c2tnb239v1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C, /* [4595] OBJ_X9_62_c2tnb239v2 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D, /* [4603] OBJ_X9_62_c2tnb239v3 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E, /* [4611] OBJ_X9_62_c2onb239v4 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F, /* [4619] OBJ_X9_62_c2onb239v5 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10, /* [4627] OBJ_X9_62_c2pnb272w1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11, /* [4635] OBJ_X9_62_c2pnb304w1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12, /* [4643] OBJ_X9_62_c2tnb359v1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13, /* [4651] OBJ_X9_62_c2pnb368w1 */ +0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14, /* [4659] OBJ_X9_62_c2tnb431r1 */ +0x2B,0x81,0x04,0x00,0x06, /* [4667] OBJ_secp112r1 */ +0x2B,0x81,0x04,0x00,0x07, /* [4672] OBJ_secp112r2 */ +0x2B,0x81,0x04,0x00,0x1C, /* [4677] OBJ_secp128r1 */ +0x2B,0x81,0x04,0x00,0x1D, /* [4682] OBJ_secp128r2 */ +0x2B,0x81,0x04,0x00,0x09, /* [4687] OBJ_secp160k1 */ +0x2B,0x81,0x04,0x00,0x08, /* [4692] OBJ_secp160r1 */ +0x2B,0x81,0x04,0x00,0x1E, /* [4697] OBJ_secp160r2 */ +0x2B,0x81,0x04,0x00,0x1F, /* [4702] OBJ_secp192k1 */ +0x2B,0x81,0x04,0x00,0x20, /* [4707] OBJ_secp224k1 */ +0x2B,0x81,0x04,0x00,0x21, /* [4712] OBJ_secp224r1 */ +0x2B,0x81,0x04,0x00,0x0A, /* [4717] OBJ_secp256k1 */ +0x2B,0x81,0x04,0x00,0x22, /* [4722] OBJ_secp384r1 */ +0x2B,0x81,0x04,0x00,0x23, /* [4727] OBJ_secp521r1 */ +0x2B,0x81,0x04,0x00,0x04, /* [4732] OBJ_sect113r1 */ +0x2B,0x81,0x04,0x00,0x05, /* [4737] OBJ_sect113r2 */ +0x2B,0x81,0x04,0x00,0x16, /* [4742] OBJ_sect131r1 */ +0x2B,0x81,0x04,0x00,0x17, /* [4747] OBJ_sect131r2 */ +0x2B,0x81,0x04,0x00,0x01, /* [4752] OBJ_sect163k1 */ +0x2B,0x81,0x04,0x00,0x02, /* [4757] OBJ_sect163r1 */ +0x2B,0x81,0x04,0x00,0x0F, /* [4762] OBJ_sect163r2 */ +0x2B,0x81,0x04,0x00,0x18, /* [4767] OBJ_sect193r1 */ +0x2B,0x81,0x04,0x00,0x19, /* [4772] OBJ_sect193r2 */ +0x2B,0x81,0x04,0x00,0x1A, /* [4777] OBJ_sect233k1 */ +0x2B,0x81,0x04,0x00,0x1B, /* [4782] OBJ_sect233r1 */ +0x2B,0x81,0x04,0x00,0x03, /* [4787] OBJ_sect239k1 */ +0x2B,0x81,0x04,0x00,0x10, /* [4792] OBJ_sect283k1 */ +0x2B,0x81,0x04,0x00,0x11, /* [4797] OBJ_sect283r1 */ +0x2B,0x81,0x04,0x00,0x24, /* [4802] OBJ_sect409k1 */ +0x2B,0x81,0x04,0x00,0x25, /* [4807] OBJ_sect409r1 */ +0x2B,0x81,0x04,0x00,0x26, /* [4812] OBJ_sect571k1 */ +0x2B,0x81,0x04,0x00,0x27, /* [4817] OBJ_sect571r1 */ +0x67,0x2B,0x0D,0x04,0x01, /* [4822] OBJ_wap_wsg_idm_ecid_wtls1 */ +0x67,0x2B,0x0D,0x04,0x03, /* [4827] OBJ_wap_wsg_idm_ecid_wtls3 */ +0x67,0x2B,0x0D,0x04,0x04, /* [4832] OBJ_wap_wsg_idm_ecid_wtls4 */ +0x67,0x2B,0x0D,0x04,0x05, /* [4837] OBJ_wap_wsg_idm_ecid_wtls5 */ +0x67,0x2B,0x0D,0x04,0x06, /* [4842] OBJ_wap_wsg_idm_ecid_wtls6 */ +0x67,0x2B,0x0D,0x04,0x07, /* [4847] OBJ_wap_wsg_idm_ecid_wtls7 */ +0x67,0x2B,0x0D,0x04,0x08, /* [4852] OBJ_wap_wsg_idm_ecid_wtls8 */ +0x67,0x2B,0x0D,0x04,0x09, /* [4857] OBJ_wap_wsg_idm_ecid_wtls9 */ +0x67,0x2B,0x0D,0x04,0x0A, /* [4862] OBJ_wap_wsg_idm_ecid_wtls10 */ +0x67,0x2B,0x0D,0x04,0x0B, /* [4867] OBJ_wap_wsg_idm_ecid_wtls11 */ +0x67,0x2B,0x0D,0x04,0x0C, /* [4872] OBJ_wap_wsg_idm_ecid_wtls12 */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4877] OBJ_sha256WithRSAEncryption */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4886] OBJ_sha384WithRSAEncryption */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4895] OBJ_sha512WithRSAEncryption */ +0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4904] OBJ_sha224WithRSAEncryption */ +0x55,0x1D,0x1E, /* [4913] OBJ_name_constraints */ +0x55,0x1D,0x20,0x00, /* [4916] OBJ_any_policy */ +0x55,0x1D,0x21, /* [4920] OBJ_policy_mappings */ +0x55,0x1D,0x36, /* [4923] OBJ_inhibit_any_policy */ +0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4926] OBJ_sha256 */ +0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4935] OBJ_sha384 */ +0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4944] OBJ_sha512 */ +0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4953] OBJ_sha224 */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -1541,370 +1543,279 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"audio","audio",NID_audio,10,&(lvalues[3823]),0}, {"documentPublisher","documentPublisher",NID_documentPublisher,10, &(lvalues[3833]),0}, -{"id-characteristic-two-basis","id-characteristic-two-basis", - NID_X9_62_id_characteristic_two_basis,8,&(lvalues[3843]),0}, -{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[3851]),0}, -{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[3860]),0}, -{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[3869]),0}, -{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[3878]),0}, -{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[3886]),0}, -{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[3894]),0}, -{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[3902]),0}, -{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[3910]),0}, -{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[3918]),0}, -{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[3926]),0}, -{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[3934]),0}, -{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[3942]),0}, -{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[3950]),0}, -{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[3958]),0}, -{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[3966]),0}, -{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[3974]),0}, -{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[3982]),0}, -{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[3990]),0}, -{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[3998]),0}, -{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4006]),0}, -{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4014]),0}, -{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4022]),0}, -{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4030]),0}, -{"identified-organization","identified-organization", - NID_identified_organization,1,&(lvalues[4038]),0}, -{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4039]),0}, -{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4042]),0}, -{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4047]),0}, -{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4052]),0}, -{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4057]),0}, -{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4062]),0}, -{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4067]),0}, -{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4072]),0}, -{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4077]),0}, -{NULL,NULL,NID_undef,0,NULL}, -{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4082]),0}, -{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4087]),0}, -{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4092]),0}, -{NULL,NULL,NID_undef,0,NULL}, -{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4097]),0}, -{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4102]),0}, -{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4107]),0}, -{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4112]),0}, -{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4117]),0}, -{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4122]),0}, -{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4127]),0}, -{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4132]),0}, -{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4137]),0}, -{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4142]),0}, -{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4147]),0}, -{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4152]),0}, -{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4157]),0}, -{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4162]),0}, -{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4167]),0}, -{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4172]),0}, -{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4177]),0}, -{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4182]),0}, -{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4187]),0}, -{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4192]),0}, -{"wap","wap",NID_wap,2,&(lvalues[4197]),0}, -{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4199]),0}, -{"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1", - NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4202]),0}, -{"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6", - NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4207]),0}, -{"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8", - NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4212]),0}, -{"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9", - NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4217]),0}, {"x500UniqueIdentifier","x500UniqueIdentifier", - NID_x500UniqueIdentifier,3,&(lvalues[4222]),0}, -{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[4225]),0}, + NID_x500UniqueIdentifier,3,&(lvalues[3843]),0}, +{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3846]),0}, {"mime-mhs-headings","mime-mhs-headings",NID_mime_mhs_headings,6, - &(lvalues[4230]),0}, + &(lvalues[3851]),0}, {"mime-mhs-bodies","mime-mhs-bodies",NID_mime_mhs_bodies,6, - &(lvalues[4236]),0}, + &(lvalues[3857]),0}, {"id-hex-partial-message","id-hex-partial-message", - NID_id_hex_partial_message,7,&(lvalues[4242]),0}, + NID_id_hex_partial_message,7,&(lvalues[3863]),0}, {"id-hex-multipart-message","id-hex-multipart-message", - NID_id_hex_multipart_message,7,&(lvalues[4249]),0}, + NID_id_hex_multipart_message,7,&(lvalues[3870]),0}, {"generationQualifier","generationQualifier",NID_generationQualifier, - 3,&(lvalues[4256]),0}, -{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[4259]),0}, + 3,&(lvalues[3877]),0}, +{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3880]),0}, +{NULL,NULL,NID_undef,0,NULL}, {"id-set","Secure Electronic Transactions",NID_id_set,2, - &(lvalues[4262]),0}, -{"set-ctype","content types",NID_set_ctype,3,&(lvalues[4264]),0}, -{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[4267]),0}, -{"set-attr","set-attr",NID_set_attr,3,&(lvalues[4270]),0}, -{"set-policy","set-policy",NID_set_policy,3,&(lvalues[4273]),0}, + &(lvalues[3883]),0}, +{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3885]),0}, +{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3888]),0}, +{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3891]),0}, +{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3894]),0}, {"set-certExt","certificate extensions",NID_set_certExt,3, - &(lvalues[4276]),0}, -{"set-brand","set-brand",NID_set_brand,3,&(lvalues[4279]),0}, -{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[4282]),0}, + &(lvalues[3897]),0}, +{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3900]),0}, +{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3903]),0}, {"setct-PANToken","setct-PANToken",NID_setct_PANToken,4, - &(lvalues[4286]),0}, -{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[4290]),0}, -{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[4294]),0}, -{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[4298]),0}, -{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[4302]),0}, + &(lvalues[3907]),0}, +{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3911]),0}, +{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3915]),0}, +{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3919]),0}, +{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3923]),0}, {"setct-PIDataUnsigned","setct-PIDataUnsigned", - NID_setct_PIDataUnsigned,4,&(lvalues[4306]),0}, + NID_setct_PIDataUnsigned,4,&(lvalues[3927]),0}, {"setct-HODInput","setct-HODInput",NID_setct_HODInput,4, - &(lvalues[4310]),0}, + &(lvalues[3931]),0}, {"setct-AuthResBaggage","setct-AuthResBaggage", - NID_setct_AuthResBaggage,4,&(lvalues[4314]),0}, + NID_setct_AuthResBaggage,4,&(lvalues[3935]),0}, {"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage", - NID_setct_AuthRevReqBaggage,4,&(lvalues[4318]),0}, + NID_setct_AuthRevReqBaggage,4,&(lvalues[3939]),0}, {"setct-AuthRevResBaggage","setct-AuthRevResBaggage", - NID_setct_AuthRevResBaggage,4,&(lvalues[4322]),0}, + NID_setct_AuthRevResBaggage,4,&(lvalues[3943]),0}, {"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4, - &(lvalues[4326]),0}, + &(lvalues[3947]),0}, {"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4, - &(lvalues[4330]),0}, -{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[4334]),0}, + &(lvalues[3951]),0}, +{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3955]),0}, {"setct-PResData","setct-PResData",NID_setct_PResData,4, - &(lvalues[4338]),0}, + &(lvalues[3959]),0}, {"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4, - &(lvalues[4342]),0}, + &(lvalues[3963]),0}, {"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4, - &(lvalues[4346]),0}, + &(lvalues[3967]),0}, {"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4, - &(lvalues[4350]),0}, + &(lvalues[3971]),0}, {"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4, - &(lvalues[4354]),0}, + &(lvalues[3975]),0}, {"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4, - &(lvalues[4358]),0}, + &(lvalues[3979]),0}, {"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4, - &(lvalues[4362]),0}, + &(lvalues[3983]),0}, {"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg", - NID_setct_AcqCardCodeMsg,4,&(lvalues[4366]),0}, + NID_setct_AcqCardCodeMsg,4,&(lvalues[3987]),0}, {"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS, - 4,&(lvalues[4370]),0}, + 4,&(lvalues[3991]),0}, {"setct-AuthRevResData","setct-AuthRevResData", - NID_setct_AuthRevResData,4,&(lvalues[4374]),0}, + NID_setct_AuthRevResData,4,&(lvalues[3995]),0}, {"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS, - 4,&(lvalues[4378]),0}, + 4,&(lvalues[3999]),0}, {"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4, - &(lvalues[4382]),0}, + &(lvalues[4003]),0}, {"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4, - &(lvalues[4386]),0}, + &(lvalues[4007]),0}, {"setct-CapResData","setct-CapResData",NID_setct_CapResData,4, - &(lvalues[4390]),0}, + &(lvalues[4011]),0}, {"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4, - &(lvalues[4394]),0}, + &(lvalues[4015]),0}, {"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX, - 4,&(lvalues[4398]),0}, + 4,&(lvalues[4019]),0}, {"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData, - 4,&(lvalues[4402]),0}, + 4,&(lvalues[4023]),0}, {"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4, - &(lvalues[4406]),0}, + &(lvalues[4027]),0}, {"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4, - &(lvalues[4410]),0}, + &(lvalues[4031]),0}, {"setct-CredResData","setct-CredResData",NID_setct_CredResData,4, - &(lvalues[4414]),0}, + &(lvalues[4035]),0}, {"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS, - 4,&(lvalues[4418]),0}, + 4,&(lvalues[4039]),0}, {"setct-CredRevReqTBSX","setct-CredRevReqTBSX", - NID_setct_CredRevReqTBSX,4,&(lvalues[4422]),0}, + NID_setct_CredRevReqTBSX,4,&(lvalues[4043]),0}, {"setct-CredRevResData","setct-CredRevResData", - NID_setct_CredRevResData,4,&(lvalues[4426]),0}, + NID_setct_CredRevResData,4,&(lvalues[4047]),0}, {"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4, - &(lvalues[4430]),0}, + &(lvalues[4051]),0}, {"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4, - &(lvalues[4434]),0}, + &(lvalues[4055]),0}, {"setct-BatchAdminReqData","setct-BatchAdminReqData", - NID_setct_BatchAdminReqData,4,&(lvalues[4438]),0}, + NID_setct_BatchAdminReqData,4,&(lvalues[4059]),0}, {"setct-BatchAdminResData","setct-BatchAdminResData", - NID_setct_BatchAdminResData,4,&(lvalues[4442]),0}, + NID_setct_BatchAdminResData,4,&(lvalues[4063]),0}, {"setct-CardCInitResTBS","setct-CardCInitResTBS", - NID_setct_CardCInitResTBS,4,&(lvalues[4446]),0}, + NID_setct_CardCInitResTBS,4,&(lvalues[4067]),0}, {"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS", - NID_setct_MeAqCInitResTBS,4,&(lvalues[4450]),0}, + NID_setct_MeAqCInitResTBS,4,&(lvalues[4071]),0}, {"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS, - 4,&(lvalues[4454]),0}, + 4,&(lvalues[4075]),0}, {"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4, - &(lvalues[4458]),0}, + &(lvalues[4079]),0}, {"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4, - &(lvalues[4462]),0}, + &(lvalues[4083]),0}, {"setct-CertResData","setct-CertResData",NID_setct_CertResData,4, - &(lvalues[4466]),0}, + &(lvalues[4087]),0}, {"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS, - 4,&(lvalues[4470]),0}, + 4,&(lvalues[4091]),0}, {"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4, - &(lvalues[4474]),0}, + &(lvalues[4095]),0}, {"setct-PIDualSignedTBE","setct-PIDualSignedTBE", - NID_setct_PIDualSignedTBE,4,&(lvalues[4478]),0}, + NID_setct_PIDualSignedTBE,4,&(lvalues[4099]),0}, {"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE, - 4,&(lvalues[4482]),0}, + 4,&(lvalues[4103]),0}, {"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4, - &(lvalues[4486]),0}, + &(lvalues[4107]),0}, {"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4, - &(lvalues[4490]),0}, + &(lvalues[4111]),0}, {"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4, - &(lvalues[4494]),0}, + &(lvalues[4115]),0}, {"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4, - &(lvalues[4498]),0}, + &(lvalues[4119]),0}, {"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4, - &(lvalues[4502]),0}, + &(lvalues[4123]),0}, {"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4, - &(lvalues[4506]),0}, + &(lvalues[4127]),0}, {"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE", - NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4510]),0}, + NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4131]),0}, {"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE, - 4,&(lvalues[4514]),0}, + 4,&(lvalues[4135]),0}, {"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE, - 4,&(lvalues[4518]),0}, + 4,&(lvalues[4139]),0}, {"setct-AuthRevResTBEB","setct-AuthRevResTBEB", - NID_setct_AuthRevResTBEB,4,&(lvalues[4522]),0}, + NID_setct_AuthRevResTBEB,4,&(lvalues[4143]),0}, {"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4, - &(lvalues[4526]),0}, + &(lvalues[4147]),0}, {"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4, - &(lvalues[4530]),0}, + &(lvalues[4151]),0}, {"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4, - &(lvalues[4534]),0}, + &(lvalues[4155]),0}, {"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4, - &(lvalues[4538]),0}, + &(lvalues[4159]),0}, {"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX, - 4,&(lvalues[4542]),0}, + 4,&(lvalues[4163]),0}, {"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4, - &(lvalues[4546]),0}, + &(lvalues[4167]),0}, {"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4, - &(lvalues[4550]),0}, + &(lvalues[4171]),0}, {"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4, - &(lvalues[4554]),0}, + &(lvalues[4175]),0}, {"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4, - &(lvalues[4558]),0}, + &(lvalues[4179]),0}, {"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE, - 4,&(lvalues[4562]),0}, + 4,&(lvalues[4183]),0}, {"setct-CredRevReqTBEX","setct-CredRevReqTBEX", - NID_setct_CredRevReqTBEX,4,&(lvalues[4566]),0}, + NID_setct_CredRevReqTBEX,4,&(lvalues[4187]),0}, {"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE, - 4,&(lvalues[4570]),0}, + 4,&(lvalues[4191]),0}, {"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE", - NID_setct_BatchAdminReqTBE,4,&(lvalues[4574]),0}, + NID_setct_BatchAdminReqTBE,4,&(lvalues[4195]),0}, {"setct-BatchAdminResTBE","setct-BatchAdminResTBE", - NID_setct_BatchAdminResTBE,4,&(lvalues[4578]),0}, + NID_setct_BatchAdminResTBE,4,&(lvalues[4199]),0}, {"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE, - 4,&(lvalues[4582]),0}, + 4,&(lvalues[4203]),0}, {"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4, - &(lvalues[4586]),0}, + &(lvalues[4207]),0}, {"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4, - &(lvalues[4590]),0}, + &(lvalues[4211]),0}, {"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4, - &(lvalues[4594]),0}, + &(lvalues[4215]),0}, {"setct-CRLNotificationTBS","setct-CRLNotificationTBS", - NID_setct_CRLNotificationTBS,4,&(lvalues[4598]),0}, + NID_setct_CRLNotificationTBS,4,&(lvalues[4219]),0}, {"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS", - NID_setct_CRLNotificationResTBS,4,&(lvalues[4602]),0}, + NID_setct_CRLNotificationResTBS,4,&(lvalues[4223]),0}, {"setct-BCIDistributionTBS","setct-BCIDistributionTBS", - NID_setct_BCIDistributionTBS,4,&(lvalues[4606]),0}, + NID_setct_BCIDistributionTBS,4,&(lvalues[4227]),0}, {"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4, - &(lvalues[4610]),0}, + &(lvalues[4231]),0}, {"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4, - &(lvalues[4614]),0}, + &(lvalues[4235]),0}, {"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4, - &(lvalues[4618]),0}, -{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4622]),0}, -{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4626]),0}, + &(lvalues[4239]),0}, +{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4243]),0}, +{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4247]),0}, {"setext-cv","additional verification",NID_setext_cv,4, - &(lvalues[4630]),0}, + &(lvalues[4251]),0}, {"set-policy-root","set-policy-root",NID_set_policy_root,4, - &(lvalues[4634]),0}, + &(lvalues[4255]),0}, {"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4, - &(lvalues[4638]),0}, + &(lvalues[4259]),0}, {"setCext-certType","setCext-certType",NID_setCext_certType,4, - &(lvalues[4642]),0}, + &(lvalues[4263]),0}, {"setCext-merchData","setCext-merchData",NID_setCext_merchData,4, - &(lvalues[4646]),0}, + &(lvalues[4267]),0}, {"setCext-cCertRequired","setCext-cCertRequired", - NID_setCext_cCertRequired,4,&(lvalues[4650]),0}, + NID_setCext_cCertRequired,4,&(lvalues[4271]),0}, {"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4, - &(lvalues[4654]),0}, + &(lvalues[4275]),0}, {"setCext-setExt","setCext-setExt",NID_setCext_setExt,4, - &(lvalues[4658]),0}, + &(lvalues[4279]),0}, {"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4, - &(lvalues[4662]),0}, + &(lvalues[4283]),0}, {"setCext-PGWYcapabilities","setCext-PGWYcapabilities", - NID_setCext_PGWYcapabilities,4,&(lvalues[4666]),0}, + NID_setCext_PGWYcapabilities,4,&(lvalues[4287]),0}, {"setCext-TokenIdentifier","setCext-TokenIdentifier", - NID_setCext_TokenIdentifier,4,&(lvalues[4670]),0}, + NID_setCext_TokenIdentifier,4,&(lvalues[4291]),0}, {"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4, - &(lvalues[4674]),0}, + &(lvalues[4295]),0}, {"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4, - &(lvalues[4678]),0}, + &(lvalues[4299]),0}, {"setCext-IssuerCapabilities","setCext-IssuerCapabilities", - NID_setCext_IssuerCapabilities,4,&(lvalues[4682]),0}, -{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4686]),0}, + NID_setCext_IssuerCapabilities,4,&(lvalues[4303]),0}, +{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4307]),0}, {"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap, - 4,&(lvalues[4690]),0}, + 4,&(lvalues[4311]),0}, {"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4, - &(lvalues[4694]),0}, + &(lvalues[4315]),0}, {"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4, - &(lvalues[4698]),0}, + &(lvalues[4319]),0}, {"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5, - &(lvalues[4702]),0}, -{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4707]),0}, + &(lvalues[4323]),0}, +{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4328]),0}, {"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5, - &(lvalues[4712]),0}, + &(lvalues[4333]),0}, {"setAttr-Token-B0Prime","setAttr-Token-B0Prime", - NID_setAttr_Token_B0Prime,5,&(lvalues[4717]),0}, + NID_setAttr_Token_B0Prime,5,&(lvalues[4338]),0}, {"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5, - &(lvalues[4722]),0}, + &(lvalues[4343]),0}, {"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5, - &(lvalues[4727]),0}, + &(lvalues[4348]),0}, {"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5, - &(lvalues[4732]),0}, + &(lvalues[4353]),0}, {"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm, - 6,&(lvalues[4737]),0}, + 6,&(lvalues[4358]),0}, {"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6, - &(lvalues[4743]),0}, + &(lvalues[4364]),0}, {"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6, - &(lvalues[4749]),0}, + &(lvalues[4370]),0}, {"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6, - &(lvalues[4755]),0}, + &(lvalues[4376]),0}, {"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig, - 6,&(lvalues[4761]),0}, + 6,&(lvalues[4382]),0}, {"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4, - &(lvalues[4767]),0}, + &(lvalues[4388]),0}, {"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4, - &(lvalues[4771]),0}, + &(lvalues[4392]),0}, {"set-brand-AmericanExpress","set-brand-AmericanExpress", - NID_set_brand_AmericanExpress,4,&(lvalues[4775]),0}, -{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4779]),0}, + NID_set_brand_AmericanExpress,4,&(lvalues[4396]),0}, +{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4400]),0}, {"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4, - &(lvalues[4783]),0}, + &(lvalues[4404]),0}, {"set-brand-MasterCard","set-brand-MasterCard", - NID_set_brand_MasterCard,4,&(lvalues[4787]),0}, + NID_set_brand_MasterCard,4,&(lvalues[4408]),0}, {"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5, - &(lvalues[4791]),0}, -{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4796]),0}, + &(lvalues[4412]),0}, +{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4417]),0}, {"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET", - NID_rsaOAEPEncryptionSET,9,&(lvalues[4804]),0}, -{"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3", - NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4813]),0}, -{"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4", - NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4818]),0}, -{"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5", - NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4823]),0}, -{"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7", - NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4828]),0}, -{"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10", - NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4833]),0}, -{"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11", - NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4838]),0}, -{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12", - NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4843]),0}, -{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login, - 10,&(lvalues[4848]),0}, -{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10, - &(lvalues[4858]),0}, -{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4868]),0}, -{"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3, - &(lvalues[4872]),0}, -{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3, - &(lvalues[4875]),0}, -{"ITU-T","itu-t",NID_itu_t,1,&(lvalues[4878]),0}, + NID_rsaOAEPEncryptionSET,9,&(lvalues[4425]),0}, +{"ITU-T","itu-t",NID_itu_t,1,&(lvalues[4434]),0}, {"JOINT-ISO-ITU-T","joint-iso-itu-t",NID_joint_iso_itu_t,1, - &(lvalues[4879]),0}, + &(lvalues[4435]),0}, {"international-organizations","International Organizations", - NID_international_organizations,1,&(lvalues[4880]),0}, -{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL}, -{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL}, + NID_international_organizations,1,&(lvalues[4436]),0}, +{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login, + 10,&(lvalues[4437]),0}, +{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10, + &(lvalues[4447]),0}, {"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL}, {"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL}, {"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL}, @@ -1915,40 +1826,132 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL}, {"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL}, {"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL}, -{"inhibitAnyPolicy","X509v3 Inhibit Any Policy", - NID_inhibit_any_policy,3,&(lvalues[4881]),0}, +{"streetAddress","streetAddress",NID_streetAddress,3,&(lvalues[4457]),0}, +{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4460]),0}, +{"identified-organization","identified-organization", + NID_identified_organization,1,&(lvalues[4463]),0}, +{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4464]),0}, +{"wap","wap",NID_wap,2,&(lvalues[4467]),0}, +{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4469]),0}, +{"id-characteristic-two-basis","id-characteristic-two-basis", + NID_X9_62_id_characteristic_two_basis,8,&(lvalues[4472]),0}, +{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[4480]),0}, +{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[4489]),0}, +{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[4498]),0}, +{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[4507]),0}, +{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[4515]),0}, +{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[4523]),0}, +{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[4531]),0}, +{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[4539]),0}, +{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[4547]),0}, +{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[4555]),0}, +{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[4563]),0}, +{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[4571]),0}, +{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[4579]),0}, +{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[4587]),0}, +{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[4595]),0}, +{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[4603]),0}, +{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[4611]),0}, +{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[4619]),0}, +{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[4627]),0}, +{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4635]),0}, +{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4643]),0}, +{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4651]),0}, +{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4659]),0}, +{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4667]),0}, +{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4672]),0}, +{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4677]),0}, +{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4682]),0}, +{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4687]),0}, +{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4692]),0}, +{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4697]),0}, +{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4702]),0}, +{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4707]),0}, +{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4712]),0}, +{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4717]),0}, +{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4722]),0}, +{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4727]),0}, +{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4732]),0}, +{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4737]),0}, +{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4742]),0}, +{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4747]),0}, +{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4752]),0}, +{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4757]),0}, +{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4762]),0}, +{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4767]),0}, +{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4772]),0}, +{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4777]),0}, +{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4782]),0}, +{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4787]),0}, +{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4792]),0}, +{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4797]),0}, +{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4802]),0}, +{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4807]),0}, +{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4812]),0}, +{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4817]),0}, +{"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1", + NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4822]),0}, +{"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3", + NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4827]),0}, +{"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4", + NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4832]),0}, +{"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5", + NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4837]),0}, +{"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6", + NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4842]),0}, +{"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7", + NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4847]),0}, +{"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8", + NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4852]),0}, +{"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9", + NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4857]),0}, +{"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10", + NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4862]),0}, +{"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11", + NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4867]),0}, +{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12", + NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4872]),0}, {"RSA-SHA256","sha256WithRSAEncryption",NID_sha256WithRSAEncryption,9, - &(lvalues[4884]),0}, + &(lvalues[4877]),0}, {"RSA-SHA384","sha384WithRSAEncryption",NID_sha384WithRSAEncryption,9, - &(lvalues[4893]),0}, + &(lvalues[4886]),0}, {"RSA-SHA512","sha512WithRSAEncryption",NID_sha512WithRSAEncryption,9, - &(lvalues[4902]),0}, + &(lvalues[4895]),0}, {"RSA-SHA224","sha224WithRSAEncryption",NID_sha224WithRSAEncryption,9, - &(lvalues[4911]),0}, -{"SHA256","sha256",NID_sha256,9,&(lvalues[4920]),0}, -{"SHA384","sha384",NID_sha384,9,&(lvalues[4929]),0}, -{"SHA512","sha512",NID_sha512,9,&(lvalues[4938]),0}, -{"SHA224","sha224",NID_sha224,9,&(lvalues[4947]),0}, + &(lvalues[4904]),0}, +{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3, + &(lvalues[4913]),0}, +{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4916]),0}, +{"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3, + &(lvalues[4920]),0}, +{"inhibitAnyPolicy","X509v3 Inhibit Any Policy", + NID_inhibit_any_policy,3,&(lvalues[4923]),0}, +{"SHA256","sha256",NID_sha256,9,&(lvalues[4926]),0}, +{"SHA384","sha384",NID_sha384,9,&(lvalues[4935]),0}, +{"SHA512","sha512",NID_sha512,9,&(lvalues[4944]),0}, +{"SHA224","sha224",NID_sha224,9,&(lvalues[4953]),0}, +{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL}, +{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[364]),/* "AD_DVCS" */ &(nid_objs[419]),/* "AES-128-CBC" */ &(nid_objs[421]),/* "AES-128-CFB" */ -&(nid_objs[726]),/* "AES-128-CFB1" */ -&(nid_objs[729]),/* "AES-128-CFB8" */ +&(nid_objs[650]),/* "AES-128-CFB1" */ +&(nid_objs[653]),/* "AES-128-CFB8" */ &(nid_objs[418]),/* "AES-128-ECB" */ &(nid_objs[420]),/* "AES-128-OFB" */ &(nid_objs[423]),/* "AES-192-CBC" */ &(nid_objs[425]),/* "AES-192-CFB" */ -&(nid_objs[727]),/* "AES-192-CFB1" */ -&(nid_objs[730]),/* "AES-192-CFB8" */ +&(nid_objs[651]),/* "AES-192-CFB1" */ +&(nid_objs[654]),/* "AES-192-CFB8" */ &(nid_objs[422]),/* "AES-192-ECB" */ &(nid_objs[424]),/* "AES-192-OFB" */ &(nid_objs[427]),/* "AES-256-CBC" */ &(nid_objs[429]),/* "AES-256-CFB" */ -&(nid_objs[728]),/* "AES-256-CFB1" */ -&(nid_objs[731]),/* "AES-256-CFB8" */ +&(nid_objs[652]),/* "AES-256-CFB1" */ +&(nid_objs[655]),/* "AES-256-CFB8" */ &(nid_objs[426]),/* "AES-256-ECB" */ &(nid_objs[428]),/* "AES-256-OFB" */ &(nid_objs[91]),/* "BF-CBC" */ @@ -1966,10 +1969,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[367]),/* "CrlID" */ &(nid_objs[391]),/* "DC" */ &(nid_objs[31]),/* "DES-CBC" */ -&(nid_objs[707]),/* "DES-CDMF" */ +&(nid_objs[643]),/* "DES-CDMF" */ &(nid_objs[30]),/* "DES-CFB" */ -&(nid_objs[732]),/* "DES-CFB1" */ -&(nid_objs[733]),/* "DES-CFB8" */ +&(nid_objs[656]),/* "DES-CFB1" */ +&(nid_objs[657]),/* "DES-CFB8" */ &(nid_objs[29]),/* "DES-ECB" */ &(nid_objs[32]),/* "DES-EDE" */ &(nid_objs[43]),/* "DES-EDE-CBC" */ @@ -1978,8 +1981,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[33]),/* "DES-EDE3" */ &(nid_objs[44]),/* "DES-EDE3-CBC" */ &(nid_objs[61]),/* "DES-EDE3-CFB" */ -&(nid_objs[734]),/* "DES-EDE3-CFB1" */ -&(nid_objs[735]),/* "DES-EDE3-CFB8" */ +&(nid_objs[658]),/* "DES-EDE3-CFB1" */ +&(nid_objs[659]),/* "DES-EDE3-CFB8" */ &(nid_objs[63]),/* "DES-EDE3-OFB" */ &(nid_objs[45]),/* "DES-OFB" */ &(nid_objs[80]),/* "DESX-CBC" */ @@ -1998,8 +2001,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[46]),/* "IDEA-OFB" */ &(nid_objs[181]),/* "ISO" */ &(nid_objs[183]),/* "ISO-US" */ -&(nid_objs[721]),/* "ITU-T" */ -&(nid_objs[722]),/* "JOINT-ISO-ITU-T" */ +&(nid_objs[645]),/* "ITU-T" */ +&(nid_objs[646]),/* "JOINT-ISO-ITU-T" */ &(nid_objs[15]),/* "L" */ &(nid_objs[ 3]),/* "MD2" */ &(nid_objs[257]),/* "MD4" */ @@ -2016,8 +2019,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[180]),/* "OCSPSigning" */ &(nid_objs[379]),/* "ORG" */ &(nid_objs[18]),/* "OU" */ -&(nid_objs[724]),/* "Oakley-EC2N-3" */ -&(nid_objs[725]),/* "Oakley-EC2N-4" */ +&(nid_objs[744]),/* "Oakley-EC2N-3" */ +&(nid_objs[745]),/* "Oakley-EC2N-4" */ &(nid_objs[ 9]),/* "PBE-MD2-DES" */ &(nid_objs[168]),/* "PBE-MD2-RC2-64" */ &(nid_objs[10]),/* "PBE-MD5-DES" */ @@ -2058,16 +2061,16 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[42]),/* "RSA-SHA" */ &(nid_objs[65]),/* "RSA-SHA1" */ &(nid_objs[115]),/* "RSA-SHA1-2" */ -&(nid_objs[740]),/* "RSA-SHA224" */ -&(nid_objs[737]),/* "RSA-SHA256" */ -&(nid_objs[738]),/* "RSA-SHA384" */ -&(nid_objs[739]),/* "RSA-SHA512" */ +&(nid_objs[735]),/* "RSA-SHA224" */ +&(nid_objs[732]),/* "RSA-SHA256" */ +&(nid_objs[733]),/* "RSA-SHA384" */ +&(nid_objs[734]),/* "RSA-SHA512" */ &(nid_objs[41]),/* "SHA" */ &(nid_objs[64]),/* "SHA1" */ -&(nid_objs[744]),/* "SHA224" */ -&(nid_objs[741]),/* "SHA256" */ -&(nid_objs[742]),/* "SHA384" */ -&(nid_objs[743]),/* "SHA512" */ +&(nid_objs[743]),/* "SHA224" */ +&(nid_objs[740]),/* "SHA256" */ +&(nid_objs[741]),/* "SHA384" */ +&(nid_objs[742]),/* "SHA512" */ &(nid_objs[188]),/* "SMIME" */ &(nid_objs[167]),/* "SMIME-CAPS" */ &(nid_objs[100]),/* "SN" */ @@ -2091,7 +2094,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[363]),/* "ad_timestamping" */ &(nid_objs[376]),/* "algorithm" */ &(nid_objs[405]),/* "ansi-X9-62" */ -&(nid_objs[718]),/* "anyPolicy" */ +&(nid_objs[737]),/* "anyPolicy" */ &(nid_objs[370]),/* "archiveCutoff" */ &(nid_objs[484]),/* "associatedDomain" */ &(nid_objs[485]),/* "associatedName" */ @@ -2102,31 +2105,31 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[365]),/* "basicOCSPResponse" */ &(nid_objs[285]),/* "biometricInfo" */ &(nid_objs[494]),/* "buildingName" */ -&(nid_objs[514]),/* "c2onb191v4" */ -&(nid_objs[515]),/* "c2onb191v5" */ -&(nid_objs[520]),/* "c2onb239v4" */ -&(nid_objs[521]),/* "c2onb239v5" */ -&(nid_objs[507]),/* "c2pnb163v1" */ -&(nid_objs[508]),/* "c2pnb163v2" */ -&(nid_objs[509]),/* "c2pnb163v3" */ -&(nid_objs[510]),/* "c2pnb176v1" */ -&(nid_objs[516]),/* "c2pnb208w1" */ -&(nid_objs[522]),/* "c2pnb272w1" */ -&(nid_objs[523]),/* "c2pnb304w1" */ -&(nid_objs[525]),/* "c2pnb368w1" */ -&(nid_objs[511]),/* "c2tnb191v1" */ -&(nid_objs[512]),/* "c2tnb191v2" */ -&(nid_objs[513]),/* "c2tnb191v3" */ -&(nid_objs[517]),/* "c2tnb239v1" */ -&(nid_objs[518]),/* "c2tnb239v2" */ -&(nid_objs[519]),/* "c2tnb239v3" */ -&(nid_objs[524]),/* "c2tnb359v1" */ -&(nid_objs[526]),/* "c2tnb431r1" */ +&(nid_objs[677]),/* "c2onb191v4" */ +&(nid_objs[678]),/* "c2onb191v5" */ +&(nid_objs[683]),/* "c2onb239v4" */ +&(nid_objs[684]),/* "c2onb239v5" */ +&(nid_objs[670]),/* "c2pnb163v1" */ +&(nid_objs[671]),/* "c2pnb163v2" */ +&(nid_objs[672]),/* "c2pnb163v3" */ +&(nid_objs[673]),/* "c2pnb176v1" */ +&(nid_objs[679]),/* "c2pnb208w1" */ +&(nid_objs[685]),/* "c2pnb272w1" */ +&(nid_objs[686]),/* "c2pnb304w1" */ +&(nid_objs[688]),/* "c2pnb368w1" */ +&(nid_objs[674]),/* "c2tnb191v1" */ +&(nid_objs[675]),/* "c2tnb191v2" */ +&(nid_objs[676]),/* "c2tnb191v3" */ +&(nid_objs[680]),/* "c2tnb239v1" */ +&(nid_objs[681]),/* "c2tnb239v2" */ +&(nid_objs[682]),/* "c2tnb239v3" */ +&(nid_objs[687]),/* "c2tnb359v1" */ +&(nid_objs[689]),/* "c2tnb431r1" */ &(nid_objs[483]),/* "cNAMERecord" */ &(nid_objs[179]),/* "caIssuers" */ &(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */ &(nid_objs[152]),/* "certBag" */ -&(nid_objs[528]),/* "certicom-arc" */ +&(nid_objs[663]),/* "certicom-arc" */ &(nid_objs[89]),/* "certificatePolicies" */ &(nid_objs[54]),/* "challengePassword" */ &(nid_objs[407]),/* "characteristic-two-field" */ @@ -2171,7 +2174,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[453]),/* "friendlyCountry" */ &(nid_objs[490]),/* "friendlyCountryName" */ &(nid_objs[156]),/* "friendlyName" */ -&(nid_objs[574]),/* "generationQualifier" */ +&(nid_objs[509]),/* "generationQualifier" */ &(nid_objs[163]),/* "hmacWithSHA1" */ &(nid_objs[432]),/* "holdInstructionCallIssuer" */ &(nid_objs[430]),/* "holdInstructionCode" */ @@ -2199,7 +2202,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[362]),/* "id-cct-PKIResponse" */ &(nid_objs[360]),/* "id-cct-crs" */ &(nid_objs[81]),/* "id-ce" */ -&(nid_objs[503]),/* "id-characteristic-two-basis" */ +&(nid_objs[666]),/* "id-characteristic-two-basis" */ &(nid_objs[263]),/* "id-cmc" */ &(nid_objs[334]),/* "id-cmc-addExtensions" */ &(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */ @@ -2222,8 +2225,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[327]),/* "id-cmc-statusInfo" */ &(nid_objs[331]),/* "id-cmc-transactionId" */ &(nid_objs[408]),/* "id-ecPublicKey" */ -&(nid_objs[573]),/* "id-hex-multipart-message" */ -&(nid_objs[572]),/* "id-hex-partial-message" */ +&(nid_objs[508]),/* "id-hex-multipart-message" */ +&(nid_objs[507]),/* "id-hex-partial-message" */ &(nid_objs[260]),/* "id-it" */ &(nid_objs[302]),/* "id-it-caKeyUpdateInfo" */ &(nid_objs[298]),/* "id-it-caProtEncCert" */ @@ -2283,7 +2286,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[314]),/* "id-regInfo" */ &(nid_objs[322]),/* "id-regInfo-certReq" */ &(nid_objs[321]),/* "id-regInfo-utf8Pairs" */ -&(nid_objs[576]),/* "id-set" */ +&(nid_objs[512]),/* "id-set" */ &(nid_objs[191]),/* "id-smime-aa" */ &(nid_objs[215]),/* "id-smime-aa-contentHint" */ &(nid_objs[218]),/* "id-smime-aa-contentIdentifier" */ @@ -2352,11 +2355,11 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[194]),/* "id-smime-spq" */ &(nid_objs[250]),/* "id-smime-spq-ets-sqt-unotice" */ &(nid_objs[249]),/* "id-smime-spq-ets-sqt-uri" */ -&(nid_objs[527]),/* "identified-organization" */ +&(nid_objs[662]),/* "identified-organization" */ &(nid_objs[461]),/* "info" */ -&(nid_objs[736]),/* "inhibitAnyPolicy" */ +&(nid_objs[739]),/* "inhibitAnyPolicy" */ &(nid_objs[101]),/* "initials" */ -&(nid_objs[723]),/* "international-organizations" */ +&(nid_objs[647]),/* "international-organizations" */ &(nid_objs[142]),/* "invalidityDate" */ &(nid_objs[294]),/* "ipsecEndSystem" */ &(nid_objs[295]),/* "ipsecTunnel" */ @@ -2375,9 +2378,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[182]),/* "member-body" */ &(nid_objs[51]),/* "messageDigest" */ &(nid_objs[383]),/* "mgmt" */ -&(nid_objs[569]),/* "mime-mhs" */ -&(nid_objs[571]),/* "mime-mhs-bodies" */ -&(nid_objs[570]),/* "mime-mhs-headings" */ +&(nid_objs[504]),/* "mime-mhs" */ +&(nid_objs[506]),/* "mime-mhs-bodies" */ +&(nid_objs[505]),/* "mime-mhs-headings" */ &(nid_objs[488]),/* "mobileTelephoneNumber" */ &(nid_objs[136]),/* "msCTLSign" */ &(nid_objs[135]),/* "msCodeCom" */ @@ -2385,11 +2388,11 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[138]),/* "msEFS" */ &(nid_objs[171]),/* "msExtReq" */ &(nid_objs[137]),/* "msSGC" */ -&(nid_objs[716]),/* "msSmartcardLogin" */ -&(nid_objs[717]),/* "msUPN" */ +&(nid_objs[648]),/* "msSmartcardLogin" */ +&(nid_objs[649]),/* "msUPN" */ &(nid_objs[481]),/* "nSRecord" */ &(nid_objs[173]),/* "name" */ -&(nid_objs[720]),/* "nameConstraints" */ +&(nid_objs[736]),/* "nameConstraints" */ &(nid_objs[369]),/* "noCheck" */ &(nid_objs[403]),/* "noRevAvail" */ &(nid_objs[72]),/* "nsBaseUrl" */ @@ -2404,7 +2407,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[73]),/* "nsRevocationUrl" */ &(nid_objs[139]),/* "nsSGC" */ &(nid_objs[77]),/* "nsSslServerName" */ -&(nid_objs[504]),/* "onBasis" */ +&(nid_objs[667]),/* "onBasis" */ &(nid_objs[491]),/* "organizationalStatus" */ &(nid_objs[475]),/* "otherMailbox" */ &(nid_objs[489]),/* "pagerTelephoneNumber" */ @@ -2437,8 +2440,9 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ &(nid_objs[47]),/* "pkcs9" */ &(nid_objs[401]),/* "policyConstraints" */ -&(nid_objs[719]),/* "policyMappings" */ -&(nid_objs[506]),/* "ppBasis" */ +&(nid_objs[738]),/* "policyMappings" */ +&(nid_objs[661]),/* "postalCode" */ +&(nid_objs[669]),/* "ppBasis" */ &(nid_objs[406]),/* "prime-field" */ &(nid_objs[409]),/* "prime192v1" */ &(nid_objs[410]),/* "prime192v2" */ @@ -2449,7 +2453,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[415]),/* "prime256v1" */ &(nid_objs[385]),/* "private" */ &(nid_objs[84]),/* "privateKeyUsagePeriod" */ -&(nid_objs[575]),/* "pseudonym" */ +&(nid_objs[510]),/* "pseudonym" */ &(nid_objs[435]),/* "pss" */ &(nid_objs[286]),/* "qcStatements" */ &(nid_objs[457]),/* "qualityLabelledData" */ @@ -2458,7 +2462,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[448]),/* "room" */ &(nid_objs[463]),/* "roomNumber" */ &(nid_objs[ 6]),/* "rsaEncryption" */ -&(nid_objs[708]),/* "rsaOAEPEncryptionSET" */ +&(nid_objs[644]),/* "rsaOAEPEncryptionSET" */ &(nid_objs[377]),/* "rsaSignature" */ &(nid_objs[ 1]),/* "rsadsi" */ &(nid_objs[482]),/* "sOARecord" */ @@ -2467,178 +2471,179 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[290]),/* "sbqp-ipAddrBlock" */ &(nid_objs[292]),/* "sbqp-routerIdentifier" */ &(nid_objs[159]),/* "sdsiCertificate" */ -&(nid_objs[529]),/* "secp112r1" */ -&(nid_objs[530]),/* "secp112r2" */ -&(nid_objs[531]),/* "secp128r1" */ -&(nid_objs[532]),/* "secp128r2" */ -&(nid_objs[533]),/* "secp160k1" */ -&(nid_objs[534]),/* "secp160r1" */ -&(nid_objs[535]),/* "secp160r2" */ -&(nid_objs[536]),/* "secp192k1" */ -&(nid_objs[538]),/* "secp224k1" */ -&(nid_objs[539]),/* "secp224r1" */ -&(nid_objs[540]),/* "secp256k1" */ -&(nid_objs[542]),/* "secp384r1" */ -&(nid_objs[543]),/* "secp521r1" */ +&(nid_objs[690]),/* "secp112r1" */ +&(nid_objs[691]),/* "secp112r2" */ +&(nid_objs[692]),/* "secp128r1" */ +&(nid_objs[693]),/* "secp128r2" */ +&(nid_objs[694]),/* "secp160k1" */ +&(nid_objs[695]),/* "secp160r1" */ +&(nid_objs[696]),/* "secp160r2" */ +&(nid_objs[697]),/* "secp192k1" */ +&(nid_objs[698]),/* "secp224k1" */ +&(nid_objs[699]),/* "secp224r1" */ +&(nid_objs[700]),/* "secp256k1" */ +&(nid_objs[701]),/* "secp384r1" */ +&(nid_objs[702]),/* "secp521r1" */ &(nid_objs[154]),/* "secretBag" */ &(nid_objs[474]),/* "secretary" */ -&(nid_objs[544]),/* "sect113r1" */ -&(nid_objs[545]),/* "sect113r2" */ -&(nid_objs[546]),/* "sect131r1" */ -&(nid_objs[547]),/* "sect131r2" */ -&(nid_objs[548]),/* "sect163k1" */ -&(nid_objs[549]),/* "sect163r1" */ -&(nid_objs[550]),/* "sect163r2" */ -&(nid_objs[551]),/* "sect193r1" */ -&(nid_objs[552]),/* "sect193r2" */ -&(nid_objs[553]),/* "sect233k1" */ -&(nid_objs[554]),/* "sect233r1" */ -&(nid_objs[555]),/* "sect239k1" */ -&(nid_objs[556]),/* "sect283k1" */ -&(nid_objs[557]),/* "sect283r1" */ -&(nid_objs[558]),/* "sect409k1" */ -&(nid_objs[559]),/* "sect409r1" */ -&(nid_objs[560]),/* "sect571k1" */ -&(nid_objs[561]),/* "sect571r1" */ +&(nid_objs[703]),/* "sect113r1" */ +&(nid_objs[704]),/* "sect113r2" */ +&(nid_objs[705]),/* "sect131r1" */ +&(nid_objs[706]),/* "sect131r2" */ +&(nid_objs[707]),/* "sect163k1" */ +&(nid_objs[708]),/* "sect163r1" */ +&(nid_objs[709]),/* "sect163r2" */ +&(nid_objs[710]),/* "sect193r1" */ +&(nid_objs[711]),/* "sect193r2" */ +&(nid_objs[712]),/* "sect233k1" */ +&(nid_objs[713]),/* "sect233r1" */ +&(nid_objs[714]),/* "sect239k1" */ +&(nid_objs[715]),/* "sect283k1" */ +&(nid_objs[716]),/* "sect283r1" */ +&(nid_objs[717]),/* "sect409k1" */ +&(nid_objs[718]),/* "sect409r1" */ +&(nid_objs[719]),/* "sect571k1" */ +&(nid_objs[720]),/* "sect571r1" */ &(nid_objs[386]),/* "security" */ &(nid_objs[394]),/* "selected-attribute-types" */ &(nid_objs[105]),/* "serialNumber" */ &(nid_objs[129]),/* "serverAuth" */ &(nid_objs[371]),/* "serviceLocator" */ -&(nid_objs[689]),/* "set-addPolicy" */ -&(nid_objs[579]),/* "set-attr" */ -&(nid_objs[582]),/* "set-brand" */ -&(nid_objs[702]),/* "set-brand-AmericanExpress" */ -&(nid_objs[701]),/* "set-brand-Diners" */ -&(nid_objs[700]),/* "set-brand-IATA-ATA" */ -&(nid_objs[703]),/* "set-brand-JCB" */ -&(nid_objs[705]),/* "set-brand-MasterCard" */ -&(nid_objs[706]),/* "set-brand-Novus" */ -&(nid_objs[704]),/* "set-brand-Visa" */ -&(nid_objs[581]),/* "set-certExt" */ -&(nid_objs[577]),/* "set-ctype" */ -&(nid_objs[578]),/* "set-msgExt" */ -&(nid_objs[580]),/* "set-policy" */ -&(nid_objs[671]),/* "set-policy-root" */ -&(nid_objs[688]),/* "set-rootKeyThumb" */ -&(nid_objs[684]),/* "setAttr-Cert" */ -&(nid_objs[695]),/* "setAttr-GenCryptgrm" */ -&(nid_objs[687]),/* "setAttr-IssCap" */ -&(nid_objs[692]),/* "setAttr-IssCap-CVM" */ -&(nid_objs[694]),/* "setAttr-IssCap-Sig" */ -&(nid_objs[693]),/* "setAttr-IssCap-T2" */ -&(nid_objs[685]),/* "setAttr-PGWYcap" */ -&(nid_objs[699]),/* "setAttr-SecDevSig" */ -&(nid_objs[696]),/* "setAttr-T2Enc" */ -&(nid_objs[697]),/* "setAttr-T2cleartxt" */ -&(nid_objs[698]),/* "setAttr-TokICCsig" */ -&(nid_objs[691]),/* "setAttr-Token-B0Prime" */ -&(nid_objs[690]),/* "setAttr-Token-EMV" */ -&(nid_objs[686]),/* "setAttr-TokenType" */ -&(nid_objs[683]),/* "setCext-IssuerCapabilities" */ -&(nid_objs[679]),/* "setCext-PGWYcapabilities" */ -&(nid_objs[680]),/* "setCext-TokenIdentifier" */ -&(nid_objs[682]),/* "setCext-TokenType" */ -&(nid_objs[681]),/* "setCext-Track2Data" */ -&(nid_objs[675]),/* "setCext-cCertRequired" */ -&(nid_objs[673]),/* "setCext-certType" */ -&(nid_objs[672]),/* "setCext-hashedRoot" */ -&(nid_objs[674]),/* "setCext-merchData" */ -&(nid_objs[677]),/* "setCext-setExt" */ -&(nid_objs[678]),/* "setCext-setQualf" */ -&(nid_objs[676]),/* "setCext-tunneling" */ -&(nid_objs[604]),/* "setct-AcqCardCodeMsg" */ -&(nid_objs[640]),/* "setct-AcqCardCodeMsgTBE" */ -&(nid_objs[634]),/* "setct-AuthReqTBE" */ -&(nid_objs[598]),/* "setct-AuthReqTBS" */ -&(nid_objs[591]),/* "setct-AuthResBaggage" */ -&(nid_objs[635]),/* "setct-AuthResTBE" */ -&(nid_objs[636]),/* "setct-AuthResTBEX" */ -&(nid_objs[599]),/* "setct-AuthResTBS" */ -&(nid_objs[600]),/* "setct-AuthResTBSX" */ -&(nid_objs[592]),/* "setct-AuthRevReqBaggage" */ -&(nid_objs[641]),/* "setct-AuthRevReqTBE" */ -&(nid_objs[605]),/* "setct-AuthRevReqTBS" */ -&(nid_objs[593]),/* "setct-AuthRevResBaggage" */ -&(nid_objs[606]),/* "setct-AuthRevResData" */ -&(nid_objs[642]),/* "setct-AuthRevResTBE" */ -&(nid_objs[643]),/* "setct-AuthRevResTBEB" */ -&(nid_objs[607]),/* "setct-AuthRevResTBS" */ -&(nid_objs[637]),/* "setct-AuthTokenTBE" */ -&(nid_objs[601]),/* "setct-AuthTokenTBS" */ -&(nid_objs[664]),/* "setct-BCIDistributionTBS" */ -&(nid_objs[622]),/* "setct-BatchAdminReqData" */ -&(nid_objs[656]),/* "setct-BatchAdminReqTBE" */ -&(nid_objs[623]),/* "setct-BatchAdminResData" */ -&(nid_objs[657]),/* "setct-BatchAdminResTBE" */ -&(nid_objs[663]),/* "setct-CRLNotificationResTBS" */ -&(nid_objs[662]),/* "setct-CRLNotificationTBS" */ -&(nid_objs[644]),/* "setct-CapReqTBE" */ -&(nid_objs[645]),/* "setct-CapReqTBEX" */ -&(nid_objs[608]),/* "setct-CapReqTBS" */ -&(nid_objs[609]),/* "setct-CapReqTBSX" */ -&(nid_objs[610]),/* "setct-CapResData" */ -&(nid_objs[646]),/* "setct-CapResTBE" */ -&(nid_objs[647]),/* "setct-CapRevReqTBE" */ -&(nid_objs[648]),/* "setct-CapRevReqTBEX" */ -&(nid_objs[611]),/* "setct-CapRevReqTBS" */ -&(nid_objs[612]),/* "setct-CapRevReqTBSX" */ -&(nid_objs[613]),/* "setct-CapRevResData" */ -&(nid_objs[649]),/* "setct-CapRevResTBE" */ -&(nid_objs[602]),/* "setct-CapTokenData" */ -&(nid_objs[594]),/* "setct-CapTokenSeq" */ -&(nid_objs[638]),/* "setct-CapTokenTBE" */ -&(nid_objs[639]),/* "setct-CapTokenTBEX" */ -&(nid_objs[603]),/* "setct-CapTokenTBS" */ -&(nid_objs[624]),/* "setct-CardCInitResTBS" */ -&(nid_objs[630]),/* "setct-CertInqReqTBS" */ -&(nid_objs[627]),/* "setct-CertReqData" */ -&(nid_objs[659]),/* "setct-CertReqTBE" */ -&(nid_objs[660]),/* "setct-CertReqTBEX" */ -&(nid_objs[628]),/* "setct-CertReqTBS" */ -&(nid_objs[629]),/* "setct-CertResData" */ -&(nid_objs[661]),/* "setct-CertResTBE" */ -&(nid_objs[650]),/* "setct-CredReqTBE" */ -&(nid_objs[651]),/* "setct-CredReqTBEX" */ -&(nid_objs[614]),/* "setct-CredReqTBS" */ -&(nid_objs[615]),/* "setct-CredReqTBSX" */ -&(nid_objs[616]),/* "setct-CredResData" */ -&(nid_objs[652]),/* "setct-CredResTBE" */ -&(nid_objs[653]),/* "setct-CredRevReqTBE" */ -&(nid_objs[654]),/* "setct-CredRevReqTBEX" */ -&(nid_objs[617]),/* "setct-CredRevReqTBS" */ -&(nid_objs[618]),/* "setct-CredRevReqTBSX" */ -&(nid_objs[619]),/* "setct-CredRevResData" */ -&(nid_objs[655]),/* "setct-CredRevResTBE" */ -&(nid_objs[631]),/* "setct-ErrorTBS" */ -&(nid_objs[590]),/* "setct-HODInput" */ -&(nid_objs[625]),/* "setct-MeAqCInitResTBS" */ -&(nid_objs[586]),/* "setct-OIData" */ -&(nid_objs[583]),/* "setct-PANData" */ -&(nid_objs[585]),/* "setct-PANOnly" */ -&(nid_objs[584]),/* "setct-PANToken" */ -&(nid_objs[620]),/* "setct-PCertReqData" */ -&(nid_objs[621]),/* "setct-PCertResTBS" */ -&(nid_objs[587]),/* "setct-PI" */ -&(nid_objs[596]),/* "setct-PI-TBS" */ -&(nid_objs[588]),/* "setct-PIData" */ -&(nid_objs[589]),/* "setct-PIDataUnsigned" */ -&(nid_objs[632]),/* "setct-PIDualSignedTBE" */ -&(nid_objs[633]),/* "setct-PIUnsignedTBE" */ -&(nid_objs[595]),/* "setct-PInitResData" */ -&(nid_objs[597]),/* "setct-PResData" */ -&(nid_objs[658]),/* "setct-RegFormReqTBE" */ -&(nid_objs[626]),/* "setct-RegFormResTBS" */ -&(nid_objs[670]),/* "setext-cv" */ -&(nid_objs[665]),/* "setext-genCrypt" */ -&(nid_objs[666]),/* "setext-miAuth" */ -&(nid_objs[668]),/* "setext-pinAny" */ -&(nid_objs[667]),/* "setext-pinSecure" */ -&(nid_objs[669]),/* "setext-track2" */ +&(nid_objs[625]),/* "set-addPolicy" */ +&(nid_objs[515]),/* "set-attr" */ +&(nid_objs[518]),/* "set-brand" */ +&(nid_objs[638]),/* "set-brand-AmericanExpress" */ +&(nid_objs[637]),/* "set-brand-Diners" */ +&(nid_objs[636]),/* "set-brand-IATA-ATA" */ +&(nid_objs[639]),/* "set-brand-JCB" */ +&(nid_objs[641]),/* "set-brand-MasterCard" */ +&(nid_objs[642]),/* "set-brand-Novus" */ +&(nid_objs[640]),/* "set-brand-Visa" */ +&(nid_objs[517]),/* "set-certExt" */ +&(nid_objs[513]),/* "set-ctype" */ +&(nid_objs[514]),/* "set-msgExt" */ +&(nid_objs[516]),/* "set-policy" */ +&(nid_objs[607]),/* "set-policy-root" */ +&(nid_objs[624]),/* "set-rootKeyThumb" */ +&(nid_objs[620]),/* "setAttr-Cert" */ +&(nid_objs[631]),/* "setAttr-GenCryptgrm" */ +&(nid_objs[623]),/* "setAttr-IssCap" */ +&(nid_objs[628]),/* "setAttr-IssCap-CVM" */ +&(nid_objs[630]),/* "setAttr-IssCap-Sig" */ +&(nid_objs[629]),/* "setAttr-IssCap-T2" */ +&(nid_objs[621]),/* "setAttr-PGWYcap" */ +&(nid_objs[635]),/* "setAttr-SecDevSig" */ +&(nid_objs[632]),/* "setAttr-T2Enc" */ +&(nid_objs[633]),/* "setAttr-T2cleartxt" */ +&(nid_objs[634]),/* "setAttr-TokICCsig" */ +&(nid_objs[627]),/* "setAttr-Token-B0Prime" */ +&(nid_objs[626]),/* "setAttr-Token-EMV" */ +&(nid_objs[622]),/* "setAttr-TokenType" */ +&(nid_objs[619]),/* "setCext-IssuerCapabilities" */ +&(nid_objs[615]),/* "setCext-PGWYcapabilities" */ +&(nid_objs[616]),/* "setCext-TokenIdentifier" */ +&(nid_objs[618]),/* "setCext-TokenType" */ +&(nid_objs[617]),/* "setCext-Track2Data" */ +&(nid_objs[611]),/* "setCext-cCertRequired" */ +&(nid_objs[609]),/* "setCext-certType" */ +&(nid_objs[608]),/* "setCext-hashedRoot" */ +&(nid_objs[610]),/* "setCext-merchData" */ +&(nid_objs[613]),/* "setCext-setExt" */ +&(nid_objs[614]),/* "setCext-setQualf" */ +&(nid_objs[612]),/* "setCext-tunneling" */ +&(nid_objs[540]),/* "setct-AcqCardCodeMsg" */ +&(nid_objs[576]),/* "setct-AcqCardCodeMsgTBE" */ +&(nid_objs[570]),/* "setct-AuthReqTBE" */ +&(nid_objs[534]),/* "setct-AuthReqTBS" */ +&(nid_objs[527]),/* "setct-AuthResBaggage" */ +&(nid_objs[571]),/* "setct-AuthResTBE" */ +&(nid_objs[572]),/* "setct-AuthResTBEX" */ +&(nid_objs[535]),/* "setct-AuthResTBS" */ +&(nid_objs[536]),/* "setct-AuthResTBSX" */ +&(nid_objs[528]),/* "setct-AuthRevReqBaggage" */ +&(nid_objs[577]),/* "setct-AuthRevReqTBE" */ +&(nid_objs[541]),/* "setct-AuthRevReqTBS" */ +&(nid_objs[529]),/* "setct-AuthRevResBaggage" */ +&(nid_objs[542]),/* "setct-AuthRevResData" */ +&(nid_objs[578]),/* "setct-AuthRevResTBE" */ +&(nid_objs[579]),/* "setct-AuthRevResTBEB" */ +&(nid_objs[543]),/* "setct-AuthRevResTBS" */ +&(nid_objs[573]),/* "setct-AuthTokenTBE" */ +&(nid_objs[537]),/* "setct-AuthTokenTBS" */ +&(nid_objs[600]),/* "setct-BCIDistributionTBS" */ +&(nid_objs[558]),/* "setct-BatchAdminReqData" */ +&(nid_objs[592]),/* "setct-BatchAdminReqTBE" */ +&(nid_objs[559]),/* "setct-BatchAdminResData" */ +&(nid_objs[593]),/* "setct-BatchAdminResTBE" */ +&(nid_objs[599]),/* "setct-CRLNotificationResTBS" */ +&(nid_objs[598]),/* "setct-CRLNotificationTBS" */ +&(nid_objs[580]),/* "setct-CapReqTBE" */ +&(nid_objs[581]),/* "setct-CapReqTBEX" */ +&(nid_objs[544]),/* "setct-CapReqTBS" */ +&(nid_objs[545]),/* "setct-CapReqTBSX" */ +&(nid_objs[546]),/* "setct-CapResData" */ +&(nid_objs[582]),/* "setct-CapResTBE" */ +&(nid_objs[583]),/* "setct-CapRevReqTBE" */ +&(nid_objs[584]),/* "setct-CapRevReqTBEX" */ +&(nid_objs[547]),/* "setct-CapRevReqTBS" */ +&(nid_objs[548]),/* "setct-CapRevReqTBSX" */ +&(nid_objs[549]),/* "setct-CapRevResData" */ +&(nid_objs[585]),/* "setct-CapRevResTBE" */ +&(nid_objs[538]),/* "setct-CapTokenData" */ +&(nid_objs[530]),/* "setct-CapTokenSeq" */ +&(nid_objs[574]),/* "setct-CapTokenTBE" */ +&(nid_objs[575]),/* "setct-CapTokenTBEX" */ +&(nid_objs[539]),/* "setct-CapTokenTBS" */ +&(nid_objs[560]),/* "setct-CardCInitResTBS" */ +&(nid_objs[566]),/* "setct-CertInqReqTBS" */ +&(nid_objs[563]),/* "setct-CertReqData" */ +&(nid_objs[595]),/* "setct-CertReqTBE" */ +&(nid_objs[596]),/* "setct-CertReqTBEX" */ +&(nid_objs[564]),/* "setct-CertReqTBS" */ +&(nid_objs[565]),/* "setct-CertResData" */ +&(nid_objs[597]),/* "setct-CertResTBE" */ +&(nid_objs[586]),/* "setct-CredReqTBE" */ +&(nid_objs[587]),/* "setct-CredReqTBEX" */ +&(nid_objs[550]),/* "setct-CredReqTBS" */ +&(nid_objs[551]),/* "setct-CredReqTBSX" */ +&(nid_objs[552]),/* "setct-CredResData" */ +&(nid_objs[588]),/* "setct-CredResTBE" */ +&(nid_objs[589]),/* "setct-CredRevReqTBE" */ +&(nid_objs[590]),/* "setct-CredRevReqTBEX" */ +&(nid_objs[553]),/* "setct-CredRevReqTBS" */ +&(nid_objs[554]),/* "setct-CredRevReqTBSX" */ +&(nid_objs[555]),/* "setct-CredRevResData" */ +&(nid_objs[591]),/* "setct-CredRevResTBE" */ +&(nid_objs[567]),/* "setct-ErrorTBS" */ +&(nid_objs[526]),/* "setct-HODInput" */ +&(nid_objs[561]),/* "setct-MeAqCInitResTBS" */ +&(nid_objs[522]),/* "setct-OIData" */ +&(nid_objs[519]),/* "setct-PANData" */ +&(nid_objs[521]),/* "setct-PANOnly" */ +&(nid_objs[520]),/* "setct-PANToken" */ +&(nid_objs[556]),/* "setct-PCertReqData" */ +&(nid_objs[557]),/* "setct-PCertResTBS" */ +&(nid_objs[523]),/* "setct-PI" */ +&(nid_objs[532]),/* "setct-PI-TBS" */ +&(nid_objs[524]),/* "setct-PIData" */ +&(nid_objs[525]),/* "setct-PIDataUnsigned" */ +&(nid_objs[568]),/* "setct-PIDualSignedTBE" */ +&(nid_objs[569]),/* "setct-PIUnsignedTBE" */ +&(nid_objs[531]),/* "setct-PInitResData" */ +&(nid_objs[533]),/* "setct-PResData" */ +&(nid_objs[594]),/* "setct-RegFormReqTBE" */ +&(nid_objs[562]),/* "setct-RegFormResTBS" */ +&(nid_objs[606]),/* "setext-cv" */ +&(nid_objs[601]),/* "setext-genCrypt" */ +&(nid_objs[602]),/* "setext-miAuth" */ +&(nid_objs[604]),/* "setext-pinAny" */ +&(nid_objs[603]),/* "setext-pinSecure" */ +&(nid_objs[605]),/* "setext-track2" */ &(nid_objs[52]),/* "signingTime" */ &(nid_objs[454]),/* "simpleSecurityObject" */ &(nid_objs[496]),/* "singleLevelQuality" */ &(nid_objs[387]),/* "snmpv2" */ +&(nid_objs[660]),/* "streetAddress" */ &(nid_objs[85]),/* "subjectAltName" */ &(nid_objs[398]),/* "subjectInfoAccess" */ &(nid_objs[82]),/* "subjectKeyIdentifier" */ @@ -2649,27 +2654,27 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[293]),/* "textNotice" */ &(nid_objs[133]),/* "timeStamping" */ &(nid_objs[106]),/* "title" */ -&(nid_objs[505]),/* "tpBasis" */ +&(nid_objs[668]),/* "tpBasis" */ &(nid_objs[375]),/* "trustRoot" */ &(nid_objs[436]),/* "ucl" */ &(nid_objs[55]),/* "unstructuredAddress" */ &(nid_objs[49]),/* "unstructuredName" */ &(nid_objs[465]),/* "userClass" */ &(nid_objs[373]),/* "valid" */ -&(nid_objs[562]),/* "wap" */ -&(nid_objs[563]),/* "wap-wsg" */ -&(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */ -&(nid_objs[713]),/* "wap-wsg-idm-ecid-wtls10" */ -&(nid_objs[714]),/* "wap-wsg-idm-ecid-wtls11" */ -&(nid_objs[715]),/* "wap-wsg-idm-ecid-wtls12" */ -&(nid_objs[709]),/* "wap-wsg-idm-ecid-wtls3" */ -&(nid_objs[710]),/* "wap-wsg-idm-ecid-wtls4" */ -&(nid_objs[711]),/* "wap-wsg-idm-ecid-wtls5" */ -&(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */ -&(nid_objs[712]),/* "wap-wsg-idm-ecid-wtls7" */ -&(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */ -&(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */ -&(nid_objs[568]),/* "x500UniqueIdentifier" */ +&(nid_objs[664]),/* "wap" */ +&(nid_objs[665]),/* "wap-wsg" */ +&(nid_objs[721]),/* "wap-wsg-idm-ecid-wtls1" */ +&(nid_objs[729]),/* "wap-wsg-idm-ecid-wtls10" */ +&(nid_objs[730]),/* "wap-wsg-idm-ecid-wtls11" */ +&(nid_objs[731]),/* "wap-wsg-idm-ecid-wtls12" */ +&(nid_objs[722]),/* "wap-wsg-idm-ecid-wtls3" */ +&(nid_objs[723]),/* "wap-wsg-idm-ecid-wtls4" */ +&(nid_objs[724]),/* "wap-wsg-idm-ecid-wtls5" */ +&(nid_objs[725]),/* "wap-wsg-idm-ecid-wtls6" */ +&(nid_objs[726]),/* "wap-wsg-idm-ecid-wtls7" */ +&(nid_objs[727]),/* "wap-wsg-idm-ecid-wtls8" */ +&(nid_objs[728]),/* "wap-wsg-idm-ecid-wtls9" */ +&(nid_objs[503]),/* "x500UniqueIdentifier" */ &(nid_objs[158]),/* "x509Certificate" */ &(nid_objs[160]),/* "x509Crl" */ }; @@ -2694,15 +2699,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[430]),/* "Hold Instruction Code" */ &(nid_objs[431]),/* "Hold Instruction None" */ &(nid_objs[433]),/* "Hold Instruction Reject" */ -&(nid_objs[698]),/* "ICC or token signature" */ +&(nid_objs[634]),/* "ICC or token signature" */ &(nid_objs[294]),/* "IPSec End System" */ &(nid_objs[295]),/* "IPSec Tunnel" */ &(nid_objs[296]),/* "IPSec User" */ &(nid_objs[182]),/* "ISO Member Body" */ &(nid_objs[183]),/* "ISO US Member Body" */ -&(nid_objs[723]),/* "International Organizations" */ +&(nid_objs[647]),/* "International Organizations" */ &(nid_objs[142]),/* "Invalidity Date" */ -&(nid_objs[569]),/* "MIME MHS" */ +&(nid_objs[504]),/* "MIME MHS" */ &(nid_objs[388]),/* "Mail" */ &(nid_objs[383]),/* "Management" */ &(nid_objs[417]),/* "Microsoft CSP Name" */ @@ -2711,9 +2716,9 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[171]),/* "Microsoft Extension Request" */ &(nid_objs[134]),/* "Microsoft Individual Code Signing" */ &(nid_objs[137]),/* "Microsoft Server Gated Crypto" */ -&(nid_objs[716]),/* "Microsoft Smartcardlogin" */ +&(nid_objs[648]),/* "Microsoft Smartcardlogin" */ &(nid_objs[136]),/* "Microsoft Trust List Signing" */ -&(nid_objs[717]),/* "Microsoft Universal Principal Name" */ +&(nid_objs[649]),/* "Microsoft Universal Principal Name" */ &(nid_objs[393]),/* "NULL" */ &(nid_objs[404]),/* "NULL" */ &(nid_objs[72]),/* "Netscape Base Url" */ @@ -2748,7 +2753,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[188]),/* "S/MIME" */ &(nid_objs[167]),/* "S/MIME Capabilities" */ &(nid_objs[387]),/* "SNMPv2" */ -&(nid_objs[576]),/* "Secure Electronic Transactions" */ +&(nid_objs[512]),/* "Secure Electronic Transactions" */ &(nid_objs[386]),/* "Security" */ &(nid_objs[394]),/* "Selected Attribute Types" */ &(nid_objs[143]),/* "Strong Extranet ID" */ @@ -2759,7 +2764,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[375]),/* "Trust Root" */ &(nid_objs[12]),/* "X509" */ &(nid_objs[402]),/* "X509v3 AC Targeting" */ -&(nid_objs[718]),/* "X509v3 Any Policy" */ +&(nid_objs[737]),/* "X509v3 Any Policy" */ &(nid_objs[90]),/* "X509v3 Authority Key Identifier" */ &(nid_objs[87]),/* "X509v3 Basic Constraints" */ &(nid_objs[103]),/* "X509v3 CRL Distribution Points" */ @@ -2768,13 +2773,13 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[89]),/* "X509v3 Certificate Policies" */ &(nid_objs[140]),/* "X509v3 Delta CRL Indicator" */ &(nid_objs[126]),/* "X509v3 Extended Key Usage" */ -&(nid_objs[736]),/* "X509v3 Inhibit Any Policy" */ +&(nid_objs[739]),/* "X509v3 Inhibit Any Policy" */ &(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */ &(nid_objs[83]),/* "X509v3 Key Usage" */ -&(nid_objs[720]),/* "X509v3 Name Constraints" */ +&(nid_objs[736]),/* "X509v3 Name Constraints" */ &(nid_objs[403]),/* "X509v3 No Revocation Available" */ &(nid_objs[401]),/* "X509v3 Policy Constraints" */ -&(nid_objs[719]),/* "X509v3 Policy Mappings" */ +&(nid_objs[738]),/* "X509v3 Policy Mappings" */ &(nid_objs[84]),/* "X509v3 Private Key Usage Period" */ &(nid_objs[85]),/* "X509v3 Subject Alternative Name" */ &(nid_objs[82]),/* "X509v3 Subject Key Identifier" */ @@ -2787,23 +2792,23 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[288]),/* "ac-targeting" */ &(nid_objs[446]),/* "account" */ &(nid_objs[364]),/* "ad dvcs" */ -&(nid_objs[670]),/* "additional verification" */ +&(nid_objs[606]),/* "additional verification" */ &(nid_objs[419]),/* "aes-128-cbc" */ &(nid_objs[421]),/* "aes-128-cfb" */ -&(nid_objs[726]),/* "aes-128-cfb1" */ -&(nid_objs[729]),/* "aes-128-cfb8" */ +&(nid_objs[650]),/* "aes-128-cfb1" */ +&(nid_objs[653]),/* "aes-128-cfb8" */ &(nid_objs[418]),/* "aes-128-ecb" */ &(nid_objs[420]),/* "aes-128-ofb" */ &(nid_objs[423]),/* "aes-192-cbc" */ &(nid_objs[425]),/* "aes-192-cfb" */ -&(nid_objs[727]),/* "aes-192-cfb1" */ -&(nid_objs[730]),/* "aes-192-cfb8" */ +&(nid_objs[651]),/* "aes-192-cfb1" */ +&(nid_objs[654]),/* "aes-192-cfb8" */ &(nid_objs[422]),/* "aes-192-ecb" */ &(nid_objs[424]),/* "aes-192-ofb" */ &(nid_objs[427]),/* "aes-256-cbc" */ &(nid_objs[429]),/* "aes-256-cfb" */ -&(nid_objs[728]),/* "aes-256-cfb1" */ -&(nid_objs[731]),/* "aes-256-cfb8" */ +&(nid_objs[652]),/* "aes-256-cfb1" */ +&(nid_objs[655]),/* "aes-256-cfb8" */ &(nid_objs[426]),/* "aes-256-ecb" */ &(nid_objs[428]),/* "aes-256-ofb" */ &(nid_objs[376]),/* "algorithm" */ @@ -2815,26 +2820,26 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[92]),/* "bf-ecb" */ &(nid_objs[94]),/* "bf-ofb" */ &(nid_objs[494]),/* "buildingName" */ -&(nid_objs[514]),/* "c2onb191v4" */ -&(nid_objs[515]),/* "c2onb191v5" */ -&(nid_objs[520]),/* "c2onb239v4" */ -&(nid_objs[521]),/* "c2onb239v5" */ -&(nid_objs[507]),/* "c2pnb163v1" */ -&(nid_objs[508]),/* "c2pnb163v2" */ -&(nid_objs[509]),/* "c2pnb163v3" */ -&(nid_objs[510]),/* "c2pnb176v1" */ -&(nid_objs[516]),/* "c2pnb208w1" */ -&(nid_objs[522]),/* "c2pnb272w1" */ -&(nid_objs[523]),/* "c2pnb304w1" */ -&(nid_objs[525]),/* "c2pnb368w1" */ -&(nid_objs[511]),/* "c2tnb191v1" */ -&(nid_objs[512]),/* "c2tnb191v2" */ -&(nid_objs[513]),/* "c2tnb191v3" */ -&(nid_objs[517]),/* "c2tnb239v1" */ -&(nid_objs[518]),/* "c2tnb239v2" */ -&(nid_objs[519]),/* "c2tnb239v3" */ -&(nid_objs[524]),/* "c2tnb359v1" */ -&(nid_objs[526]),/* "c2tnb431r1" */ +&(nid_objs[677]),/* "c2onb191v4" */ +&(nid_objs[678]),/* "c2onb191v5" */ +&(nid_objs[683]),/* "c2onb239v4" */ +&(nid_objs[684]),/* "c2onb239v5" */ +&(nid_objs[670]),/* "c2pnb163v1" */ +&(nid_objs[671]),/* "c2pnb163v2" */ +&(nid_objs[672]),/* "c2pnb163v3" */ +&(nid_objs[673]),/* "c2pnb176v1" */ +&(nid_objs[679]),/* "c2pnb208w1" */ +&(nid_objs[685]),/* "c2pnb272w1" */ +&(nid_objs[686]),/* "c2pnb304w1" */ +&(nid_objs[688]),/* "c2pnb368w1" */ +&(nid_objs[674]),/* "c2tnb191v1" */ +&(nid_objs[675]),/* "c2tnb191v2" */ +&(nid_objs[676]),/* "c2tnb191v3" */ +&(nid_objs[680]),/* "c2tnb239v1" */ +&(nid_objs[681]),/* "c2tnb239v2" */ +&(nid_objs[682]),/* "c2tnb239v3" */ +&(nid_objs[687]),/* "c2tnb359v1" */ +&(nid_objs[689]),/* "c2tnb431r1" */ &(nid_objs[483]),/* "cNAMERecord" */ &(nid_objs[443]),/* "caseIgnoreIA5StringSyntax" */ &(nid_objs[108]),/* "cast5-cbc" */ @@ -2842,14 +2847,14 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[109]),/* "cast5-ecb" */ &(nid_objs[111]),/* "cast5-ofb" */ &(nid_objs[152]),/* "certBag" */ -&(nid_objs[528]),/* "certicom-arc" */ -&(nid_objs[581]),/* "certificate extensions" */ +&(nid_objs[663]),/* "certicom-arc" */ +&(nid_objs[517]),/* "certificate extensions" */ &(nid_objs[54]),/* "challengePassword" */ &(nid_objs[407]),/* "characteristic-two-field" */ &(nid_objs[395]),/* "clearance" */ -&(nid_objs[697]),/* "cleartext track 2" */ +&(nid_objs[633]),/* "cleartext track 2" */ &(nid_objs[13]),/* "commonName" */ -&(nid_objs[577]),/* "content types" */ +&(nid_objs[513]),/* "content types" */ &(nid_objs[50]),/* "contentType" */ &(nid_objs[53]),/* "countersignature" */ &(nid_objs[14]),/* "countryName" */ @@ -2860,10 +2865,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[434]),/* "data" */ &(nid_objs[390]),/* "dcObject" */ &(nid_objs[31]),/* "des-cbc" */ -&(nid_objs[707]),/* "des-cdmf" */ +&(nid_objs[643]),/* "des-cdmf" */ &(nid_objs[30]),/* "des-cfb" */ -&(nid_objs[732]),/* "des-cfb1" */ -&(nid_objs[733]),/* "des-cfb8" */ +&(nid_objs[656]),/* "des-cfb1" */ +&(nid_objs[657]),/* "des-cfb8" */ &(nid_objs[29]),/* "des-ecb" */ &(nid_objs[32]),/* "des-ede" */ &(nid_objs[43]),/* "des-ede-cbc" */ @@ -2872,8 +2877,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[33]),/* "des-ede3" */ &(nid_objs[44]),/* "des-ede3-cbc" */ &(nid_objs[61]),/* "des-ede3-cfb" */ -&(nid_objs[734]),/* "des-ede3-cfb1" */ -&(nid_objs[735]),/* "des-ede3-cfb8" */ +&(nid_objs[658]),/* "des-ede3-cfb1" */ +&(nid_objs[659]),/* "des-ede3-cfb8" */ &(nid_objs[63]),/* "des-ede3-ofb" */ &(nid_objs[45]),/* "des-ofb" */ &(nid_objs[107]),/* "description" */ @@ -2901,15 +2906,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[297]),/* "dvcs" */ &(nid_objs[416]),/* "ecdsa-with-SHA1" */ &(nid_objs[48]),/* "emailAddress" */ -&(nid_objs[696]),/* "encrypted track 2" */ +&(nid_objs[632]),/* "encrypted track 2" */ &(nid_objs[56]),/* "extendedCertificateAttributes" */ &(nid_objs[462]),/* "favouriteDrink" */ &(nid_objs[453]),/* "friendlyCountry" */ &(nid_objs[490]),/* "friendlyCountryName" */ &(nid_objs[156]),/* "friendlyName" */ -&(nid_objs[695]),/* "generate cryptogram" */ -&(nid_objs[574]),/* "generationQualifier" */ -&(nid_objs[665]),/* "generic cryptogram" */ +&(nid_objs[631]),/* "generate cryptogram" */ +&(nid_objs[509]),/* "generationQualifier" */ +&(nid_objs[601]),/* "generic cryptogram" */ &(nid_objs[99]),/* "givenName" */ &(nid_objs[163]),/* "hmacWithSHA1" */ &(nid_objs[486]),/* "homePostalAddress" */ @@ -2935,7 +2940,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[362]),/* "id-cct-PKIResponse" */ &(nid_objs[360]),/* "id-cct-crs" */ &(nid_objs[81]),/* "id-ce" */ -&(nid_objs[503]),/* "id-characteristic-two-basis" */ +&(nid_objs[666]),/* "id-characteristic-two-basis" */ &(nid_objs[263]),/* "id-cmc" */ &(nid_objs[334]),/* "id-cmc-addExtensions" */ &(nid_objs[346]),/* "id-cmc-confirmCertAcceptance" */ @@ -2958,8 +2963,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[327]),/* "id-cmc-statusInfo" */ &(nid_objs[331]),/* "id-cmc-transactionId" */ &(nid_objs[408]),/* "id-ecPublicKey" */ -&(nid_objs[573]),/* "id-hex-multipart-message" */ -&(nid_objs[572]),/* "id-hex-partial-message" */ +&(nid_objs[508]),/* "id-hex-multipart-message" */ +&(nid_objs[507]),/* "id-hex-partial-message" */ &(nid_objs[260]),/* "id-it" */ &(nid_objs[302]),/* "id-it-caKeyUpdateInfo" */ &(nid_objs[298]),/* "id-it-caProtEncCert" */ @@ -3089,16 +3094,16 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[35]),/* "idea-cfb" */ &(nid_objs[36]),/* "idea-ecb" */ &(nid_objs[46]),/* "idea-ofb" */ -&(nid_objs[527]),/* "identified-organization" */ +&(nid_objs[662]),/* "identified-organization" */ &(nid_objs[461]),/* "info" */ &(nid_objs[101]),/* "initials" */ -&(nid_objs[724]),/* "ipsec3" */ -&(nid_objs[725]),/* "ipsec4" */ +&(nid_objs[744]),/* "ipsec3" */ +&(nid_objs[745]),/* "ipsec4" */ &(nid_objs[181]),/* "iso" */ -&(nid_objs[687]),/* "issuer capabilities" */ -&(nid_objs[721]),/* "itu-t" */ +&(nid_objs[623]),/* "issuer capabilities" */ +&(nid_objs[645]),/* "itu-t" */ &(nid_objs[492]),/* "janetMailbox" */ -&(nid_objs[722]),/* "joint-iso-itu-t" */ +&(nid_objs[646]),/* "joint-iso-itu-t" */ &(nid_objs[150]),/* "keyBag" */ &(nid_objs[477]),/* "lastModifiedBy" */ &(nid_objs[476]),/* "lastModifiedTime" */ @@ -3117,15 +3122,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[ 8]),/* "md5WithRSAEncryption" */ &(nid_objs[95]),/* "mdc2" */ &(nid_objs[96]),/* "mdc2WithRSA" */ -&(nid_objs[666]),/* "merchant initiated auth" */ -&(nid_objs[578]),/* "message extensions" */ +&(nid_objs[602]),/* "merchant initiated auth" */ +&(nid_objs[514]),/* "message extensions" */ &(nid_objs[51]),/* "messageDigest" */ -&(nid_objs[571]),/* "mime-mhs-bodies" */ -&(nid_objs[570]),/* "mime-mhs-headings" */ +&(nid_objs[506]),/* "mime-mhs-bodies" */ +&(nid_objs[505]),/* "mime-mhs-headings" */ &(nid_objs[488]),/* "mobileTelephoneNumber" */ &(nid_objs[481]),/* "nSRecord" */ &(nid_objs[173]),/* "name" */ -&(nid_objs[504]),/* "onBasis" */ +&(nid_objs[667]),/* "onBasis" */ &(nid_objs[379]),/* "org" */ &(nid_objs[17]),/* "organizationName" */ &(nid_objs[491]),/* "organizationalStatus" */ @@ -3133,7 +3138,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[475]),/* "otherMailbox" */ &(nid_objs[489]),/* "pagerTelephoneNumber" */ &(nid_objs[374]),/* "path" */ -&(nid_objs[685]),/* "payment gateway capabilities" */ +&(nid_objs[621]),/* "payment gateway capabilities" */ &(nid_objs[ 9]),/* "pbeWithMD2AndDES-CBC" */ &(nid_objs[168]),/* "pbeWithMD2AndRC2-CBC" */ &(nid_objs[112]),/* "pbeWithMD5AndCast5CBC" */ @@ -3172,7 +3177,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[22]),/* "pkcs7-signedData" */ &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ &(nid_objs[47]),/* "pkcs9" */ -&(nid_objs[506]),/* "ppBasis" */ +&(nid_objs[661]),/* "postalCode" */ +&(nid_objs[669]),/* "ppBasis" */ &(nid_objs[406]),/* "prime-field" */ &(nid_objs[409]),/* "prime192v1" */ &(nid_objs[410]),/* "prime192v2" */ @@ -3181,7 +3187,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[413]),/* "prime239v2" */ &(nid_objs[414]),/* "prime239v3" */ &(nid_objs[415]),/* "prime256v1" */ -&(nid_objs[575]),/* "pseudonym" */ +&(nid_objs[510]),/* "pseudonym" */ &(nid_objs[435]),/* "pss" */ &(nid_objs[286]),/* "qcStatements" */ &(nid_objs[457]),/* "qualityLabelledData" */ @@ -3206,7 +3212,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[463]),/* "roomNumber" */ &(nid_objs[19]),/* "rsa" */ &(nid_objs[ 6]),/* "rsaEncryption" */ -&(nid_objs[708]),/* "rsaOAEPEncryptionSET" */ +&(nid_objs[644]),/* "rsaOAEPEncryptionSET" */ &(nid_objs[377]),/* "rsaSignature" */ &(nid_objs[124]),/* "run length compression" */ &(nid_objs[482]),/* "sOARecord" */ @@ -3215,182 +3221,183 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[290]),/* "sbqp-ipAddrBlock" */ &(nid_objs[292]),/* "sbqp-routerIdentifier" */ &(nid_objs[159]),/* "sdsiCertificate" */ -&(nid_objs[529]),/* "secp112r1" */ -&(nid_objs[530]),/* "secp112r2" */ -&(nid_objs[531]),/* "secp128r1" */ -&(nid_objs[532]),/* "secp128r2" */ -&(nid_objs[533]),/* "secp160k1" */ -&(nid_objs[534]),/* "secp160r1" */ -&(nid_objs[535]),/* "secp160r2" */ -&(nid_objs[536]),/* "secp192k1" */ -&(nid_objs[538]),/* "secp224k1" */ -&(nid_objs[539]),/* "secp224r1" */ -&(nid_objs[540]),/* "secp256k1" */ -&(nid_objs[542]),/* "secp384r1" */ -&(nid_objs[543]),/* "secp521r1" */ +&(nid_objs[690]),/* "secp112r1" */ +&(nid_objs[691]),/* "secp112r2" */ +&(nid_objs[692]),/* "secp128r1" */ +&(nid_objs[693]),/* "secp128r2" */ +&(nid_objs[694]),/* "secp160k1" */ +&(nid_objs[695]),/* "secp160r1" */ +&(nid_objs[696]),/* "secp160r2" */ +&(nid_objs[697]),/* "secp192k1" */ +&(nid_objs[698]),/* "secp224k1" */ +&(nid_objs[699]),/* "secp224r1" */ +&(nid_objs[700]),/* "secp256k1" */ +&(nid_objs[701]),/* "secp384r1" */ +&(nid_objs[702]),/* "secp521r1" */ &(nid_objs[154]),/* "secretBag" */ &(nid_objs[474]),/* "secretary" */ -&(nid_objs[544]),/* "sect113r1" */ -&(nid_objs[545]),/* "sect113r2" */ -&(nid_objs[546]),/* "sect131r1" */ -&(nid_objs[547]),/* "sect131r2" */ -&(nid_objs[548]),/* "sect163k1" */ -&(nid_objs[549]),/* "sect163r1" */ -&(nid_objs[550]),/* "sect163r2" */ -&(nid_objs[551]),/* "sect193r1" */ -&(nid_objs[552]),/* "sect193r2" */ -&(nid_objs[553]),/* "sect233k1" */ -&(nid_objs[554]),/* "sect233r1" */ -&(nid_objs[555]),/* "sect239k1" */ -&(nid_objs[556]),/* "sect283k1" */ -&(nid_objs[557]),/* "sect283r1" */ -&(nid_objs[558]),/* "sect409k1" */ -&(nid_objs[559]),/* "sect409r1" */ -&(nid_objs[560]),/* "sect571k1" */ -&(nid_objs[561]),/* "sect571r1" */ -&(nid_objs[699]),/* "secure device signature" */ +&(nid_objs[703]),/* "sect113r1" */ +&(nid_objs[704]),/* "sect113r2" */ +&(nid_objs[705]),/* "sect131r1" */ +&(nid_objs[706]),/* "sect131r2" */ +&(nid_objs[707]),/* "sect163k1" */ +&(nid_objs[708]),/* "sect163r1" */ +&(nid_objs[709]),/* "sect163r2" */ +&(nid_objs[710]),/* "sect193r1" */ +&(nid_objs[711]),/* "sect193r2" */ +&(nid_objs[712]),/* "sect233k1" */ +&(nid_objs[713]),/* "sect233r1" */ +&(nid_objs[714]),/* "sect239k1" */ +&(nid_objs[715]),/* "sect283k1" */ +&(nid_objs[716]),/* "sect283r1" */ +&(nid_objs[717]),/* "sect409k1" */ +&(nid_objs[718]),/* "sect409r1" */ +&(nid_objs[719]),/* "sect571k1" */ +&(nid_objs[720]),/* "sect571r1" */ +&(nid_objs[635]),/* "secure device signature" */ &(nid_objs[105]),/* "serialNumber" */ -&(nid_objs[689]),/* "set-addPolicy" */ -&(nid_objs[579]),/* "set-attr" */ -&(nid_objs[582]),/* "set-brand" */ -&(nid_objs[702]),/* "set-brand-AmericanExpress" */ -&(nid_objs[701]),/* "set-brand-Diners" */ -&(nid_objs[700]),/* "set-brand-IATA-ATA" */ -&(nid_objs[703]),/* "set-brand-JCB" */ -&(nid_objs[705]),/* "set-brand-MasterCard" */ -&(nid_objs[706]),/* "set-brand-Novus" */ -&(nid_objs[704]),/* "set-brand-Visa" */ -&(nid_objs[580]),/* "set-policy" */ -&(nid_objs[671]),/* "set-policy-root" */ -&(nid_objs[688]),/* "set-rootKeyThumb" */ -&(nid_objs[684]),/* "setAttr-Cert" */ -&(nid_objs[692]),/* "setAttr-IssCap-CVM" */ -&(nid_objs[694]),/* "setAttr-IssCap-Sig" */ -&(nid_objs[693]),/* "setAttr-IssCap-T2" */ -&(nid_objs[691]),/* "setAttr-Token-B0Prime" */ -&(nid_objs[690]),/* "setAttr-Token-EMV" */ -&(nid_objs[686]),/* "setAttr-TokenType" */ -&(nid_objs[683]),/* "setCext-IssuerCapabilities" */ -&(nid_objs[679]),/* "setCext-PGWYcapabilities" */ -&(nid_objs[680]),/* "setCext-TokenIdentifier" */ -&(nid_objs[682]),/* "setCext-TokenType" */ -&(nid_objs[681]),/* "setCext-Track2Data" */ -&(nid_objs[675]),/* "setCext-cCertRequired" */ -&(nid_objs[673]),/* "setCext-certType" */ -&(nid_objs[672]),/* "setCext-hashedRoot" */ -&(nid_objs[674]),/* "setCext-merchData" */ -&(nid_objs[677]),/* "setCext-setExt" */ -&(nid_objs[678]),/* "setCext-setQualf" */ -&(nid_objs[676]),/* "setCext-tunneling" */ -&(nid_objs[604]),/* "setct-AcqCardCodeMsg" */ -&(nid_objs[640]),/* "setct-AcqCardCodeMsgTBE" */ -&(nid_objs[634]),/* "setct-AuthReqTBE" */ -&(nid_objs[598]),/* "setct-AuthReqTBS" */ -&(nid_objs[591]),/* "setct-AuthResBaggage" */ -&(nid_objs[635]),/* "setct-AuthResTBE" */ -&(nid_objs[636]),/* "setct-AuthResTBEX" */ -&(nid_objs[599]),/* "setct-AuthResTBS" */ -&(nid_objs[600]),/* "setct-AuthResTBSX" */ -&(nid_objs[592]),/* "setct-AuthRevReqBaggage" */ -&(nid_objs[641]),/* "setct-AuthRevReqTBE" */ -&(nid_objs[605]),/* "setct-AuthRevReqTBS" */ -&(nid_objs[593]),/* "setct-AuthRevResBaggage" */ -&(nid_objs[606]),/* "setct-AuthRevResData" */ -&(nid_objs[642]),/* "setct-AuthRevResTBE" */ -&(nid_objs[643]),/* "setct-AuthRevResTBEB" */ -&(nid_objs[607]),/* "setct-AuthRevResTBS" */ -&(nid_objs[637]),/* "setct-AuthTokenTBE" */ -&(nid_objs[601]),/* "setct-AuthTokenTBS" */ -&(nid_objs[664]),/* "setct-BCIDistributionTBS" */ -&(nid_objs[622]),/* "setct-BatchAdminReqData" */ -&(nid_objs[656]),/* "setct-BatchAdminReqTBE" */ -&(nid_objs[623]),/* "setct-BatchAdminResData" */ -&(nid_objs[657]),/* "setct-BatchAdminResTBE" */ -&(nid_objs[663]),/* "setct-CRLNotificationResTBS" */ -&(nid_objs[662]),/* "setct-CRLNotificationTBS" */ -&(nid_objs[644]),/* "setct-CapReqTBE" */ -&(nid_objs[645]),/* "setct-CapReqTBEX" */ -&(nid_objs[608]),/* "setct-CapReqTBS" */ -&(nid_objs[609]),/* "setct-CapReqTBSX" */ -&(nid_objs[610]),/* "setct-CapResData" */ -&(nid_objs[646]),/* "setct-CapResTBE" */ -&(nid_objs[647]),/* "setct-CapRevReqTBE" */ -&(nid_objs[648]),/* "setct-CapRevReqTBEX" */ -&(nid_objs[611]),/* "setct-CapRevReqTBS" */ -&(nid_objs[612]),/* "setct-CapRevReqTBSX" */ -&(nid_objs[613]),/* "setct-CapRevResData" */ -&(nid_objs[649]),/* "setct-CapRevResTBE" */ -&(nid_objs[602]),/* "setct-CapTokenData" */ -&(nid_objs[594]),/* "setct-CapTokenSeq" */ -&(nid_objs[638]),/* "setct-CapTokenTBE" */ -&(nid_objs[639]),/* "setct-CapTokenTBEX" */ -&(nid_objs[603]),/* "setct-CapTokenTBS" */ -&(nid_objs[624]),/* "setct-CardCInitResTBS" */ -&(nid_objs[630]),/* "setct-CertInqReqTBS" */ -&(nid_objs[627]),/* "setct-CertReqData" */ -&(nid_objs[659]),/* "setct-CertReqTBE" */ -&(nid_objs[660]),/* "setct-CertReqTBEX" */ -&(nid_objs[628]),/* "setct-CertReqTBS" */ -&(nid_objs[629]),/* "setct-CertResData" */ -&(nid_objs[661]),/* "setct-CertResTBE" */ -&(nid_objs[650]),/* "setct-CredReqTBE" */ -&(nid_objs[651]),/* "setct-CredReqTBEX" */ -&(nid_objs[614]),/* "setct-CredReqTBS" */ -&(nid_objs[615]),/* "setct-CredReqTBSX" */ -&(nid_objs[616]),/* "setct-CredResData" */ -&(nid_objs[652]),/* "setct-CredResTBE" */ -&(nid_objs[653]),/* "setct-CredRevReqTBE" */ -&(nid_objs[654]),/* "setct-CredRevReqTBEX" */ -&(nid_objs[617]),/* "setct-CredRevReqTBS" */ -&(nid_objs[618]),/* "setct-CredRevReqTBSX" */ -&(nid_objs[619]),/* "setct-CredRevResData" */ -&(nid_objs[655]),/* "setct-CredRevResTBE" */ -&(nid_objs[631]),/* "setct-ErrorTBS" */ -&(nid_objs[590]),/* "setct-HODInput" */ -&(nid_objs[625]),/* "setct-MeAqCInitResTBS" */ -&(nid_objs[586]),/* "setct-OIData" */ -&(nid_objs[583]),/* "setct-PANData" */ -&(nid_objs[585]),/* "setct-PANOnly" */ -&(nid_objs[584]),/* "setct-PANToken" */ -&(nid_objs[620]),/* "setct-PCertReqData" */ -&(nid_objs[621]),/* "setct-PCertResTBS" */ -&(nid_objs[587]),/* "setct-PI" */ -&(nid_objs[596]),/* "setct-PI-TBS" */ -&(nid_objs[588]),/* "setct-PIData" */ -&(nid_objs[589]),/* "setct-PIDataUnsigned" */ -&(nid_objs[632]),/* "setct-PIDualSignedTBE" */ -&(nid_objs[633]),/* "setct-PIUnsignedTBE" */ -&(nid_objs[595]),/* "setct-PInitResData" */ -&(nid_objs[597]),/* "setct-PResData" */ -&(nid_objs[658]),/* "setct-RegFormReqTBE" */ -&(nid_objs[626]),/* "setct-RegFormResTBS" */ -&(nid_objs[668]),/* "setext-pinAny" */ -&(nid_objs[667]),/* "setext-pinSecure" */ -&(nid_objs[669]),/* "setext-track2" */ +&(nid_objs[625]),/* "set-addPolicy" */ +&(nid_objs[515]),/* "set-attr" */ +&(nid_objs[518]),/* "set-brand" */ +&(nid_objs[638]),/* "set-brand-AmericanExpress" */ +&(nid_objs[637]),/* "set-brand-Diners" */ +&(nid_objs[636]),/* "set-brand-IATA-ATA" */ +&(nid_objs[639]),/* "set-brand-JCB" */ +&(nid_objs[641]),/* "set-brand-MasterCard" */ +&(nid_objs[642]),/* "set-brand-Novus" */ +&(nid_objs[640]),/* "set-brand-Visa" */ +&(nid_objs[516]),/* "set-policy" */ +&(nid_objs[607]),/* "set-policy-root" */ +&(nid_objs[624]),/* "set-rootKeyThumb" */ +&(nid_objs[620]),/* "setAttr-Cert" */ +&(nid_objs[628]),/* "setAttr-IssCap-CVM" */ +&(nid_objs[630]),/* "setAttr-IssCap-Sig" */ +&(nid_objs[629]),/* "setAttr-IssCap-T2" */ +&(nid_objs[627]),/* "setAttr-Token-B0Prime" */ +&(nid_objs[626]),/* "setAttr-Token-EMV" */ +&(nid_objs[622]),/* "setAttr-TokenType" */ +&(nid_objs[619]),/* "setCext-IssuerCapabilities" */ +&(nid_objs[615]),/* "setCext-PGWYcapabilities" */ +&(nid_objs[616]),/* "setCext-TokenIdentifier" */ +&(nid_objs[618]),/* "setCext-TokenType" */ +&(nid_objs[617]),/* "setCext-Track2Data" */ +&(nid_objs[611]),/* "setCext-cCertRequired" */ +&(nid_objs[609]),/* "setCext-certType" */ +&(nid_objs[608]),/* "setCext-hashedRoot" */ +&(nid_objs[610]),/* "setCext-merchData" */ +&(nid_objs[613]),/* "setCext-setExt" */ +&(nid_objs[614]),/* "setCext-setQualf" */ +&(nid_objs[612]),/* "setCext-tunneling" */ +&(nid_objs[540]),/* "setct-AcqCardCodeMsg" */ +&(nid_objs[576]),/* "setct-AcqCardCodeMsgTBE" */ +&(nid_objs[570]),/* "setct-AuthReqTBE" */ +&(nid_objs[534]),/* "setct-AuthReqTBS" */ +&(nid_objs[527]),/* "setct-AuthResBaggage" */ +&(nid_objs[571]),/* "setct-AuthResTBE" */ +&(nid_objs[572]),/* "setct-AuthResTBEX" */ +&(nid_objs[535]),/* "setct-AuthResTBS" */ +&(nid_objs[536]),/* "setct-AuthResTBSX" */ +&(nid_objs[528]),/* "setct-AuthRevReqBaggage" */ +&(nid_objs[577]),/* "setct-AuthRevReqTBE" */ +&(nid_objs[541]),/* "setct-AuthRevReqTBS" */ +&(nid_objs[529]),/* "setct-AuthRevResBaggage" */ +&(nid_objs[542]),/* "setct-AuthRevResData" */ +&(nid_objs[578]),/* "setct-AuthRevResTBE" */ +&(nid_objs[579]),/* "setct-AuthRevResTBEB" */ +&(nid_objs[543]),/* "setct-AuthRevResTBS" */ +&(nid_objs[573]),/* "setct-AuthTokenTBE" */ +&(nid_objs[537]),/* "setct-AuthTokenTBS" */ +&(nid_objs[600]),/* "setct-BCIDistributionTBS" */ +&(nid_objs[558]),/* "setct-BatchAdminReqData" */ +&(nid_objs[592]),/* "setct-BatchAdminReqTBE" */ +&(nid_objs[559]),/* "setct-BatchAdminResData" */ +&(nid_objs[593]),/* "setct-BatchAdminResTBE" */ +&(nid_objs[599]),/* "setct-CRLNotificationResTBS" */ +&(nid_objs[598]),/* "setct-CRLNotificationTBS" */ +&(nid_objs[580]),/* "setct-CapReqTBE" */ +&(nid_objs[581]),/* "setct-CapReqTBEX" */ +&(nid_objs[544]),/* "setct-CapReqTBS" */ +&(nid_objs[545]),/* "setct-CapReqTBSX" */ +&(nid_objs[546]),/* "setct-CapResData" */ +&(nid_objs[582]),/* "setct-CapResTBE" */ +&(nid_objs[583]),/* "setct-CapRevReqTBE" */ +&(nid_objs[584]),/* "setct-CapRevReqTBEX" */ +&(nid_objs[547]),/* "setct-CapRevReqTBS" */ +&(nid_objs[548]),/* "setct-CapRevReqTBSX" */ +&(nid_objs[549]),/* "setct-CapRevResData" */ +&(nid_objs[585]),/* "setct-CapRevResTBE" */ +&(nid_objs[538]),/* "setct-CapTokenData" */ +&(nid_objs[530]),/* "setct-CapTokenSeq" */ +&(nid_objs[574]),/* "setct-CapTokenTBE" */ +&(nid_objs[575]),/* "setct-CapTokenTBEX" */ +&(nid_objs[539]),/* "setct-CapTokenTBS" */ +&(nid_objs[560]),/* "setct-CardCInitResTBS" */ +&(nid_objs[566]),/* "setct-CertInqReqTBS" */ +&(nid_objs[563]),/* "setct-CertReqData" */ +&(nid_objs[595]),/* "setct-CertReqTBE" */ +&(nid_objs[596]),/* "setct-CertReqTBEX" */ +&(nid_objs[564]),/* "setct-CertReqTBS" */ +&(nid_objs[565]),/* "setct-CertResData" */ +&(nid_objs[597]),/* "setct-CertResTBE" */ +&(nid_objs[586]),/* "setct-CredReqTBE" */ +&(nid_objs[587]),/* "setct-CredReqTBEX" */ +&(nid_objs[550]),/* "setct-CredReqTBS" */ +&(nid_objs[551]),/* "setct-CredReqTBSX" */ +&(nid_objs[552]),/* "setct-CredResData" */ +&(nid_objs[588]),/* "setct-CredResTBE" */ +&(nid_objs[589]),/* "setct-CredRevReqTBE" */ +&(nid_objs[590]),/* "setct-CredRevReqTBEX" */ +&(nid_objs[553]),/* "setct-CredRevReqTBS" */ +&(nid_objs[554]),/* "setct-CredRevReqTBSX" */ +&(nid_objs[555]),/* "setct-CredRevResData" */ +&(nid_objs[591]),/* "setct-CredRevResTBE" */ +&(nid_objs[567]),/* "setct-ErrorTBS" */ +&(nid_objs[526]),/* "setct-HODInput" */ +&(nid_objs[561]),/* "setct-MeAqCInitResTBS" */ +&(nid_objs[522]),/* "setct-OIData" */ +&(nid_objs[519]),/* "setct-PANData" */ +&(nid_objs[521]),/* "setct-PANOnly" */ +&(nid_objs[520]),/* "setct-PANToken" */ +&(nid_objs[556]),/* "setct-PCertReqData" */ +&(nid_objs[557]),/* "setct-PCertResTBS" */ +&(nid_objs[523]),/* "setct-PI" */ +&(nid_objs[532]),/* "setct-PI-TBS" */ +&(nid_objs[524]),/* "setct-PIData" */ +&(nid_objs[525]),/* "setct-PIDataUnsigned" */ +&(nid_objs[568]),/* "setct-PIDualSignedTBE" */ +&(nid_objs[569]),/* "setct-PIUnsignedTBE" */ +&(nid_objs[531]),/* "setct-PInitResData" */ +&(nid_objs[533]),/* "setct-PResData" */ +&(nid_objs[594]),/* "setct-RegFormReqTBE" */ +&(nid_objs[562]),/* "setct-RegFormResTBS" */ +&(nid_objs[604]),/* "setext-pinAny" */ +&(nid_objs[603]),/* "setext-pinSecure" */ +&(nid_objs[605]),/* "setext-track2" */ &(nid_objs[41]),/* "sha" */ &(nid_objs[64]),/* "sha1" */ &(nid_objs[115]),/* "sha1WithRSA" */ &(nid_objs[65]),/* "sha1WithRSAEncryption" */ -&(nid_objs[744]),/* "sha224" */ -&(nid_objs[740]),/* "sha224WithRSAEncryption" */ -&(nid_objs[741]),/* "sha256" */ -&(nid_objs[737]),/* "sha256WithRSAEncryption" */ -&(nid_objs[742]),/* "sha384" */ -&(nid_objs[738]),/* "sha384WithRSAEncryption" */ -&(nid_objs[743]),/* "sha512" */ -&(nid_objs[739]),/* "sha512WithRSAEncryption" */ +&(nid_objs[743]),/* "sha224" */ +&(nid_objs[735]),/* "sha224WithRSAEncryption" */ +&(nid_objs[740]),/* "sha256" */ +&(nid_objs[732]),/* "sha256WithRSAEncryption" */ +&(nid_objs[741]),/* "sha384" */ +&(nid_objs[733]),/* "sha384WithRSAEncryption" */ +&(nid_objs[742]),/* "sha512" */ +&(nid_objs[734]),/* "sha512WithRSAEncryption" */ &(nid_objs[42]),/* "shaWithRSAEncryption" */ &(nid_objs[52]),/* "signingTime" */ &(nid_objs[454]),/* "simpleSecurityObject" */ &(nid_objs[496]),/* "singleLevelQuality" */ &(nid_objs[16]),/* "stateOrProvinceName" */ +&(nid_objs[660]),/* "streetAddress" */ &(nid_objs[498]),/* "subtreeMaximumQuality" */ &(nid_objs[497]),/* "subtreeMinimumQuality" */ &(nid_objs[100]),/* "surname" */ &(nid_objs[459]),/* "textEncodedORAddress" */ &(nid_objs[293]),/* "textNotice" */ &(nid_objs[106]),/* "title" */ -&(nid_objs[505]),/* "tpBasis" */ +&(nid_objs[668]),/* "tpBasis" */ &(nid_objs[436]),/* "ucl" */ &(nid_objs[ 0]),/* "undefined" */ &(nid_objs[55]),/* "unstructuredAddress" */ @@ -3398,20 +3405,20 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[465]),/* "userClass" */ &(nid_objs[458]),/* "userId" */ &(nid_objs[373]),/* "valid" */ -&(nid_objs[562]),/* "wap" */ -&(nid_objs[563]),/* "wap-wsg" */ -&(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */ -&(nid_objs[713]),/* "wap-wsg-idm-ecid-wtls10" */ -&(nid_objs[714]),/* "wap-wsg-idm-ecid-wtls11" */ -&(nid_objs[715]),/* "wap-wsg-idm-ecid-wtls12" */ -&(nid_objs[709]),/* "wap-wsg-idm-ecid-wtls3" */ -&(nid_objs[710]),/* "wap-wsg-idm-ecid-wtls4" */ -&(nid_objs[711]),/* "wap-wsg-idm-ecid-wtls5" */ -&(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */ -&(nid_objs[712]),/* "wap-wsg-idm-ecid-wtls7" */ -&(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */ -&(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */ -&(nid_objs[568]),/* "x500UniqueIdentifier" */ +&(nid_objs[664]),/* "wap" */ +&(nid_objs[665]),/* "wap-wsg" */ +&(nid_objs[721]),/* "wap-wsg-idm-ecid-wtls1" */ +&(nid_objs[729]),/* "wap-wsg-idm-ecid-wtls10" */ +&(nid_objs[730]),/* "wap-wsg-idm-ecid-wtls11" */ +&(nid_objs[731]),/* "wap-wsg-idm-ecid-wtls12" */ +&(nid_objs[722]),/* "wap-wsg-idm-ecid-wtls3" */ +&(nid_objs[723]),/* "wap-wsg-idm-ecid-wtls4" */ +&(nid_objs[724]),/* "wap-wsg-idm-ecid-wtls5" */ +&(nid_objs[725]),/* "wap-wsg-idm-ecid-wtls6" */ +&(nid_objs[726]),/* "wap-wsg-idm-ecid-wtls7" */ +&(nid_objs[727]),/* "wap-wsg-idm-ecid-wtls8" */ +&(nid_objs[728]),/* "wap-wsg-idm-ecid-wtls9" */ +&(nid_objs[503]),/* "x500UniqueIdentifier" */ &(nid_objs[158]),/* "x509Certificate" */ &(nid_objs[160]),/* "x509Crl" */ &(nid_objs[125]),/* "zlib compression" */ @@ -3421,25 +3428,25 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[ 0]),/* OBJ_undef 0 */ &(nid_objs[393]),/* OBJ_joint_iso_ccitt OBJ_joint_iso_itu_t */ &(nid_objs[404]),/* OBJ_ccitt OBJ_itu_t */ -&(nid_objs[721]),/* OBJ_itu_t 0 */ +&(nid_objs[645]),/* OBJ_itu_t 0 */ &(nid_objs[434]),/* OBJ_data 0 9 */ &(nid_objs[181]),/* OBJ_iso 1 */ &(nid_objs[182]),/* OBJ_member_body 1 2 */ &(nid_objs[379]),/* OBJ_org 1 3 */ -&(nid_objs[527]),/* OBJ_identified_organization 1 3 */ -&(nid_objs[722]),/* OBJ_joint_iso_itu_t 2 */ +&(nid_objs[662]),/* OBJ_identified_organization 1 3 */ +&(nid_objs[646]),/* OBJ_joint_iso_itu_t 2 */ &(nid_objs[11]),/* OBJ_X500 2 5 */ -&(nid_objs[723]),/* OBJ_international_organizations 2 23 */ +&(nid_objs[647]),/* OBJ_international_organizations 2 23 */ &(nid_objs[380]),/* OBJ_dod 1 3 6 */ &(nid_objs[12]),/* OBJ_X509 2 5 4 */ &(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */ &(nid_objs[81]),/* OBJ_id_ce 2 5 29 */ -&(nid_objs[576]),/* OBJ_id_set 2 23 42 */ -&(nid_objs[562]),/* OBJ_wap 2 23 43 */ +&(nid_objs[512]),/* OBJ_id_set 2 23 42 */ +&(nid_objs[664]),/* OBJ_wap 2 23 43 */ &(nid_objs[435]),/* OBJ_pss 0 9 2342 */ &(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */ &(nid_objs[381]),/* OBJ_iana 1 3 6 1 */ -&(nid_objs[528]),/* OBJ_certicom_arc 1 3 132 */ +&(nid_objs[663]),/* OBJ_certicom_arc 1 3 132 */ &(nid_objs[394]),/* OBJ_selected_attribute_types 2 5 1 5 */ &(nid_objs[13]),/* OBJ_commonName 2 5 4 3 */ &(nid_objs[100]),/* OBJ_surname 2 5 4 4 */ @@ -3447,17 +3454,19 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[14]),/* OBJ_countryName 2 5 4 6 */ &(nid_objs[15]),/* OBJ_localityName 2 5 4 7 */ &(nid_objs[16]),/* OBJ_stateOrProvinceName 2 5 4 8 */ +&(nid_objs[660]),/* OBJ_streetAddress 2 5 4 9 */ &(nid_objs[17]),/* OBJ_organizationName 2 5 4 10 */ &(nid_objs[18]),/* OBJ_organizationalUnitName 2 5 4 11 */ &(nid_objs[106]),/* OBJ_title 2 5 4 12 */ &(nid_objs[107]),/* OBJ_description 2 5 4 13 */ +&(nid_objs[661]),/* OBJ_postalCode 2 5 4 17 */ &(nid_objs[173]),/* OBJ_name 2 5 4 41 */ &(nid_objs[99]),/* OBJ_givenName 2 5 4 42 */ &(nid_objs[101]),/* OBJ_initials 2 5 4 43 */ -&(nid_objs[574]),/* OBJ_generationQualifier 2 5 4 44 */ -&(nid_objs[568]),/* OBJ_x500UniqueIdentifier 2 5 4 45 */ +&(nid_objs[509]),/* OBJ_generationQualifier 2 5 4 44 */ +&(nid_objs[503]),/* OBJ_x500UniqueIdentifier 2 5 4 45 */ &(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */ -&(nid_objs[575]),/* OBJ_pseudonym 2 5 4 65 */ +&(nid_objs[510]),/* OBJ_pseudonym 2 5 4 65 */ &(nid_objs[400]),/* OBJ_role 2 5 4 72 */ &(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */ &(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */ @@ -3470,23 +3479,23 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[430]),/* OBJ_hold_instruction_code 2 5 29 23 */ &(nid_objs[142]),/* OBJ_invalidity_date 2 5 29 24 */ &(nid_objs[140]),/* OBJ_delta_crl 2 5 29 27 */ -&(nid_objs[720]),/* OBJ_name_constraints 2 5 29 30 */ +&(nid_objs[736]),/* OBJ_name_constraints 2 5 29 30 */ &(nid_objs[103]),/* OBJ_crl_distribution_points 2 5 29 31 */ &(nid_objs[89]),/* OBJ_certificate_policies 2 5 29 32 */ -&(nid_objs[719]),/* OBJ_policy_mappings 2 5 29 33 */ +&(nid_objs[738]),/* OBJ_policy_mappings 2 5 29 33 */ &(nid_objs[90]),/* OBJ_authority_key_identifier 2 5 29 35 */ &(nid_objs[401]),/* OBJ_policy_constraints 2 5 29 36 */ &(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */ -&(nid_objs[736]),/* OBJ_inhibit_any_policy 2 5 29 54 */ +&(nid_objs[739]),/* OBJ_inhibit_any_policy 2 5 29 54 */ &(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */ &(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */ -&(nid_objs[577]),/* OBJ_set_ctype 2 23 42 0 */ -&(nid_objs[578]),/* OBJ_set_msgExt 2 23 42 1 */ -&(nid_objs[579]),/* OBJ_set_attr 2 23 42 3 */ -&(nid_objs[580]),/* OBJ_set_policy 2 23 42 5 */ -&(nid_objs[581]),/* OBJ_set_certExt 2 23 42 7 */ -&(nid_objs[582]),/* OBJ_set_brand 2 23 42 8 */ -&(nid_objs[563]),/* OBJ_wap_wsg 2 23 43 13 */ +&(nid_objs[513]),/* OBJ_set_ctype 2 23 42 0 */ +&(nid_objs[514]),/* OBJ_set_msgExt 2 23 42 1 */ +&(nid_objs[515]),/* OBJ_set_attr 2 23 42 3 */ +&(nid_objs[516]),/* OBJ_set_policy 2 23 42 5 */ +&(nid_objs[517]),/* OBJ_set_certExt 2 23 42 7 */ +&(nid_objs[518]),/* OBJ_set_brand 2 23 42 8 */ +&(nid_objs[665]),/* OBJ_wap_wsg 2 23 43 13 */ &(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */ &(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */ &(nid_objs[384]),/* OBJ_Experimental 1 3 6 1 3 */ @@ -3499,122 +3508,122 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */ &(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */ &(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */ -&(nid_objs[718]),/* OBJ_any_policy 2 5 29 32 0 */ -&(nid_objs[583]),/* OBJ_setct_PANData 2 23 42 0 0 */ -&(nid_objs[584]),/* OBJ_setct_PANToken 2 23 42 0 1 */ -&(nid_objs[585]),/* OBJ_setct_PANOnly 2 23 42 0 2 */ -&(nid_objs[586]),/* OBJ_setct_OIData 2 23 42 0 3 */ -&(nid_objs[587]),/* OBJ_setct_PI 2 23 42 0 4 */ -&(nid_objs[588]),/* OBJ_setct_PIData 2 23 42 0 5 */ -&(nid_objs[589]),/* OBJ_setct_PIDataUnsigned 2 23 42 0 6 */ -&(nid_objs[590]),/* OBJ_setct_HODInput 2 23 42 0 7 */ -&(nid_objs[591]),/* OBJ_setct_AuthResBaggage 2 23 42 0 8 */ -&(nid_objs[592]),/* OBJ_setct_AuthRevReqBaggage 2 23 42 0 9 */ -&(nid_objs[593]),/* OBJ_setct_AuthRevResBaggage 2 23 42 0 10 */ -&(nid_objs[594]),/* OBJ_setct_CapTokenSeq 2 23 42 0 11 */ -&(nid_objs[595]),/* OBJ_setct_PInitResData 2 23 42 0 12 */ -&(nid_objs[596]),/* OBJ_setct_PI_TBS 2 23 42 0 13 */ -&(nid_objs[597]),/* OBJ_setct_PResData 2 23 42 0 14 */ -&(nid_objs[598]),/* OBJ_setct_AuthReqTBS 2 23 42 0 16 */ -&(nid_objs[599]),/* OBJ_setct_AuthResTBS 2 23 42 0 17 */ -&(nid_objs[600]),/* OBJ_setct_AuthResTBSX 2 23 42 0 18 */ -&(nid_objs[601]),/* OBJ_setct_AuthTokenTBS 2 23 42 0 19 */ -&(nid_objs[602]),/* OBJ_setct_CapTokenData 2 23 42 0 20 */ -&(nid_objs[603]),/* OBJ_setct_CapTokenTBS 2 23 42 0 21 */ -&(nid_objs[604]),/* OBJ_setct_AcqCardCodeMsg 2 23 42 0 22 */ -&(nid_objs[605]),/* OBJ_setct_AuthRevReqTBS 2 23 42 0 23 */ -&(nid_objs[606]),/* OBJ_setct_AuthRevResData 2 23 42 0 24 */ -&(nid_objs[607]),/* OBJ_setct_AuthRevResTBS 2 23 42 0 25 */ -&(nid_objs[608]),/* OBJ_setct_CapReqTBS 2 23 42 0 26 */ -&(nid_objs[609]),/* OBJ_setct_CapReqTBSX 2 23 42 0 27 */ -&(nid_objs[610]),/* OBJ_setct_CapResData 2 23 42 0 28 */ -&(nid_objs[611]),/* OBJ_setct_CapRevReqTBS 2 23 42 0 29 */ -&(nid_objs[612]),/* OBJ_setct_CapRevReqTBSX 2 23 42 0 30 */ -&(nid_objs[613]),/* OBJ_setct_CapRevResData 2 23 42 0 31 */ -&(nid_objs[614]),/* OBJ_setct_CredReqTBS 2 23 42 0 32 */ -&(nid_objs[615]),/* OBJ_setct_CredReqTBSX 2 23 42 0 33 */ -&(nid_objs[616]),/* OBJ_setct_CredResData 2 23 42 0 34 */ -&(nid_objs[617]),/* OBJ_setct_CredRevReqTBS 2 23 42 0 35 */ -&(nid_objs[618]),/* OBJ_setct_CredRevReqTBSX 2 23 42 0 36 */ -&(nid_objs[619]),/* OBJ_setct_CredRevResData 2 23 42 0 37 */ -&(nid_objs[620]),/* OBJ_setct_PCertReqData 2 23 42 0 38 */ -&(nid_objs[621]),/* OBJ_setct_PCertResTBS 2 23 42 0 39 */ -&(nid_objs[622]),/* OBJ_setct_BatchAdminReqData 2 23 42 0 40 */ -&(nid_objs[623]),/* OBJ_setct_BatchAdminResData 2 23 42 0 41 */ -&(nid_objs[624]),/* OBJ_setct_CardCInitResTBS 2 23 42 0 42 */ -&(nid_objs[625]),/* OBJ_setct_MeAqCInitResTBS 2 23 42 0 43 */ -&(nid_objs[626]),/* OBJ_setct_RegFormResTBS 2 23 42 0 44 */ -&(nid_objs[627]),/* OBJ_setct_CertReqData 2 23 42 0 45 */ -&(nid_objs[628]),/* OBJ_setct_CertReqTBS 2 23 42 0 46 */ -&(nid_objs[629]),/* OBJ_setct_CertResData 2 23 42 0 47 */ -&(nid_objs[630]),/* OBJ_setct_CertInqReqTBS 2 23 42 0 48 */ -&(nid_objs[631]),/* OBJ_setct_ErrorTBS 2 23 42 0 49 */ -&(nid_objs[632]),/* OBJ_setct_PIDualSignedTBE 2 23 42 0 50 */ -&(nid_objs[633]),/* OBJ_setct_PIUnsignedTBE 2 23 42 0 51 */ -&(nid_objs[634]),/* OBJ_setct_AuthReqTBE 2 23 42 0 52 */ -&(nid_objs[635]),/* OBJ_setct_AuthResTBE 2 23 42 0 53 */ -&(nid_objs[636]),/* OBJ_setct_AuthResTBEX 2 23 42 0 54 */ -&(nid_objs[637]),/* OBJ_setct_AuthTokenTBE 2 23 42 0 55 */ -&(nid_objs[638]),/* OBJ_setct_CapTokenTBE 2 23 42 0 56 */ -&(nid_objs[639]),/* OBJ_setct_CapTokenTBEX 2 23 42 0 57 */ -&(nid_objs[640]),/* OBJ_setct_AcqCardCodeMsgTBE 2 23 42 0 58 */ -&(nid_objs[641]),/* OBJ_setct_AuthRevReqTBE 2 23 42 0 59 */ -&(nid_objs[642]),/* OBJ_setct_AuthRevResTBE 2 23 42 0 60 */ -&(nid_objs[643]),/* OBJ_setct_AuthRevResTBEB 2 23 42 0 61 */ -&(nid_objs[644]),/* OBJ_setct_CapReqTBE 2 23 42 0 62 */ -&(nid_objs[645]),/* OBJ_setct_CapReqTBEX 2 23 42 0 63 */ -&(nid_objs[646]),/* OBJ_setct_CapResTBE 2 23 42 0 64 */ -&(nid_objs[647]),/* OBJ_setct_CapRevReqTBE 2 23 42 0 65 */ -&(nid_objs[648]),/* OBJ_setct_CapRevReqTBEX 2 23 42 0 66 */ -&(nid_objs[649]),/* OBJ_setct_CapRevResTBE 2 23 42 0 67 */ -&(nid_objs[650]),/* OBJ_setct_CredReqTBE 2 23 42 0 68 */ -&(nid_objs[651]),/* OBJ_setct_CredReqTBEX 2 23 42 0 69 */ -&(nid_objs[652]),/* OBJ_setct_CredResTBE 2 23 42 0 70 */ -&(nid_objs[653]),/* OBJ_setct_CredRevReqTBE 2 23 42 0 71 */ -&(nid_objs[654]),/* OBJ_setct_CredRevReqTBEX 2 23 42 0 72 */ -&(nid_objs[655]),/* OBJ_setct_CredRevResTBE 2 23 42 0 73 */ -&(nid_objs[656]),/* OBJ_setct_BatchAdminReqTBE 2 23 42 0 74 */ -&(nid_objs[657]),/* OBJ_setct_BatchAdminResTBE 2 23 42 0 75 */ -&(nid_objs[658]),/* OBJ_setct_RegFormReqTBE 2 23 42 0 76 */ -&(nid_objs[659]),/* OBJ_setct_CertReqTBE 2 23 42 0 77 */ -&(nid_objs[660]),/* OBJ_setct_CertReqTBEX 2 23 42 0 78 */ -&(nid_objs[661]),/* OBJ_setct_CertResTBE 2 23 42 0 79 */ -&(nid_objs[662]),/* OBJ_setct_CRLNotificationTBS 2 23 42 0 80 */ -&(nid_objs[663]),/* OBJ_setct_CRLNotificationResTBS 2 23 42 0 81 */ -&(nid_objs[664]),/* OBJ_setct_BCIDistributionTBS 2 23 42 0 82 */ -&(nid_objs[665]),/* OBJ_setext_genCrypt 2 23 42 1 1 */ -&(nid_objs[666]),/* OBJ_setext_miAuth 2 23 42 1 3 */ -&(nid_objs[667]),/* OBJ_setext_pinSecure 2 23 42 1 4 */ -&(nid_objs[668]),/* OBJ_setext_pinAny 2 23 42 1 5 */ -&(nid_objs[669]),/* OBJ_setext_track2 2 23 42 1 7 */ -&(nid_objs[670]),/* OBJ_setext_cv 2 23 42 1 8 */ -&(nid_objs[684]),/* OBJ_setAttr_Cert 2 23 42 3 0 */ -&(nid_objs[685]),/* OBJ_setAttr_PGWYcap 2 23 42 3 1 */ -&(nid_objs[686]),/* OBJ_setAttr_TokenType 2 23 42 3 2 */ -&(nid_objs[687]),/* OBJ_setAttr_IssCap 2 23 42 3 3 */ -&(nid_objs[671]),/* OBJ_set_policy_root 2 23 42 5 0 */ -&(nid_objs[672]),/* OBJ_setCext_hashedRoot 2 23 42 7 0 */ -&(nid_objs[673]),/* OBJ_setCext_certType 2 23 42 7 1 */ -&(nid_objs[674]),/* OBJ_setCext_merchData 2 23 42 7 2 */ -&(nid_objs[675]),/* OBJ_setCext_cCertRequired 2 23 42 7 3 */ -&(nid_objs[676]),/* OBJ_setCext_tunneling 2 23 42 7 4 */ -&(nid_objs[677]),/* OBJ_setCext_setExt 2 23 42 7 5 */ -&(nid_objs[678]),/* OBJ_setCext_setQualf 2 23 42 7 6 */ -&(nid_objs[679]),/* OBJ_setCext_PGWYcapabilities 2 23 42 7 7 */ -&(nid_objs[680]),/* OBJ_setCext_TokenIdentifier 2 23 42 7 8 */ -&(nid_objs[681]),/* OBJ_setCext_Track2Data 2 23 42 7 9 */ -&(nid_objs[682]),/* OBJ_setCext_TokenType 2 23 42 7 10 */ -&(nid_objs[683]),/* OBJ_setCext_IssuerCapabilities 2 23 42 7 11 */ -&(nid_objs[700]),/* OBJ_set_brand_IATA_ATA 2 23 42 8 1 */ -&(nid_objs[704]),/* OBJ_set_brand_Visa 2 23 42 8 4 */ -&(nid_objs[705]),/* OBJ_set_brand_MasterCard 2 23 42 8 5 */ -&(nid_objs[701]),/* OBJ_set_brand_Diners 2 23 42 8 30 */ -&(nid_objs[702]),/* OBJ_set_brand_AmericanExpress 2 23 42 8 34 */ -&(nid_objs[703]),/* OBJ_set_brand_JCB 2 23 42 8 35 */ +&(nid_objs[737]),/* OBJ_any_policy 2 5 29 32 0 */ +&(nid_objs[519]),/* OBJ_setct_PANData 2 23 42 0 0 */ +&(nid_objs[520]),/* OBJ_setct_PANToken 2 23 42 0 1 */ +&(nid_objs[521]),/* OBJ_setct_PANOnly 2 23 42 0 2 */ +&(nid_objs[522]),/* OBJ_setct_OIData 2 23 42 0 3 */ +&(nid_objs[523]),/* OBJ_setct_PI 2 23 42 0 4 */ +&(nid_objs[524]),/* OBJ_setct_PIData 2 23 42 0 5 */ +&(nid_objs[525]),/* OBJ_setct_PIDataUnsigned 2 23 42 0 6 */ +&(nid_objs[526]),/* OBJ_setct_HODInput 2 23 42 0 7 */ +&(nid_objs[527]),/* OBJ_setct_AuthResBaggage 2 23 42 0 8 */ +&(nid_objs[528]),/* OBJ_setct_AuthRevReqBaggage 2 23 42 0 9 */ +&(nid_objs[529]),/* OBJ_setct_AuthRevResBaggage 2 23 42 0 10 */ +&(nid_objs[530]),/* OBJ_setct_CapTokenSeq 2 23 42 0 11 */ +&(nid_objs[531]),/* OBJ_setct_PInitResData 2 23 42 0 12 */ +&(nid_objs[532]),/* OBJ_setct_PI_TBS 2 23 42 0 13 */ +&(nid_objs[533]),/* OBJ_setct_PResData 2 23 42 0 14 */ +&(nid_objs[534]),/* OBJ_setct_AuthReqTBS 2 23 42 0 16 */ +&(nid_objs[535]),/* OBJ_setct_AuthResTBS 2 23 42 0 17 */ +&(nid_objs[536]),/* OBJ_setct_AuthResTBSX 2 23 42 0 18 */ +&(nid_objs[537]),/* OBJ_setct_AuthTokenTBS 2 23 42 0 19 */ +&(nid_objs[538]),/* OBJ_setct_CapTokenData 2 23 42 0 20 */ +&(nid_objs[539]),/* OBJ_setct_CapTokenTBS 2 23 42 0 21 */ +&(nid_objs[540]),/* OBJ_setct_AcqCardCodeMsg 2 23 42 0 22 */ +&(nid_objs[541]),/* OBJ_setct_AuthRevReqTBS 2 23 42 0 23 */ +&(nid_objs[542]),/* OBJ_setct_AuthRevResData 2 23 42 0 24 */ +&(nid_objs[543]),/* OBJ_setct_AuthRevResTBS 2 23 42 0 25 */ +&(nid_objs[544]),/* OBJ_setct_CapReqTBS 2 23 42 0 26 */ +&(nid_objs[545]),/* OBJ_setct_CapReqTBSX 2 23 42 0 27 */ +&(nid_objs[546]),/* OBJ_setct_CapResData 2 23 42 0 28 */ +&(nid_objs[547]),/* OBJ_setct_CapRevReqTBS 2 23 42 0 29 */ +&(nid_objs[548]),/* OBJ_setct_CapRevReqTBSX 2 23 42 0 30 */ +&(nid_objs[549]),/* OBJ_setct_CapRevResData 2 23 42 0 31 */ +&(nid_objs[550]),/* OBJ_setct_CredReqTBS 2 23 42 0 32 */ +&(nid_objs[551]),/* OBJ_setct_CredReqTBSX 2 23 42 0 33 */ +&(nid_objs[552]),/* OBJ_setct_CredResData 2 23 42 0 34 */ +&(nid_objs[553]),/* OBJ_setct_CredRevReqTBS 2 23 42 0 35 */ +&(nid_objs[554]),/* OBJ_setct_CredRevReqTBSX 2 23 42 0 36 */ +&(nid_objs[555]),/* OBJ_setct_CredRevResData 2 23 42 0 37 */ +&(nid_objs[556]),/* OBJ_setct_PCertReqData 2 23 42 0 38 */ +&(nid_objs[557]),/* OBJ_setct_PCertResTBS 2 23 42 0 39 */ +&(nid_objs[558]),/* OBJ_setct_BatchAdminReqData 2 23 42 0 40 */ +&(nid_objs[559]),/* OBJ_setct_BatchAdminResData 2 23 42 0 41 */ +&(nid_objs[560]),/* OBJ_setct_CardCInitResTBS 2 23 42 0 42 */ +&(nid_objs[561]),/* OBJ_setct_MeAqCInitResTBS 2 23 42 0 43 */ +&(nid_objs[562]),/* OBJ_setct_RegFormResTBS 2 23 42 0 44 */ +&(nid_objs[563]),/* OBJ_setct_CertReqData 2 23 42 0 45 */ +&(nid_objs[564]),/* OBJ_setct_CertReqTBS 2 23 42 0 46 */ +&(nid_objs[565]),/* OBJ_setct_CertResData 2 23 42 0 47 */ +&(nid_objs[566]),/* OBJ_setct_CertInqReqTBS 2 23 42 0 48 */ +&(nid_objs[567]),/* OBJ_setct_ErrorTBS 2 23 42 0 49 */ +&(nid_objs[568]),/* OBJ_setct_PIDualSignedTBE 2 23 42 0 50 */ +&(nid_objs[569]),/* OBJ_setct_PIUnsignedTBE 2 23 42 0 51 */ +&(nid_objs[570]),/* OBJ_setct_AuthReqTBE 2 23 42 0 52 */ +&(nid_objs[571]),/* OBJ_setct_AuthResTBE 2 23 42 0 53 */ +&(nid_objs[572]),/* OBJ_setct_AuthResTBEX 2 23 42 0 54 */ +&(nid_objs[573]),/* OBJ_setct_AuthTokenTBE 2 23 42 0 55 */ +&(nid_objs[574]),/* OBJ_setct_CapTokenTBE 2 23 42 0 56 */ +&(nid_objs[575]),/* OBJ_setct_CapTokenTBEX 2 23 42 0 57 */ +&(nid_objs[576]),/* OBJ_setct_AcqCardCodeMsgTBE 2 23 42 0 58 */ +&(nid_objs[577]),/* OBJ_setct_AuthRevReqTBE 2 23 42 0 59 */ +&(nid_objs[578]),/* OBJ_setct_AuthRevResTBE 2 23 42 0 60 */ +&(nid_objs[579]),/* OBJ_setct_AuthRevResTBEB 2 23 42 0 61 */ +&(nid_objs[580]),/* OBJ_setct_CapReqTBE 2 23 42 0 62 */ +&(nid_objs[581]),/* OBJ_setct_CapReqTBEX 2 23 42 0 63 */ +&(nid_objs[582]),/* OBJ_setct_CapResTBE 2 23 42 0 64 */ +&(nid_objs[583]),/* OBJ_setct_CapRevReqTBE 2 23 42 0 65 */ +&(nid_objs[584]),/* OBJ_setct_CapRevReqTBEX 2 23 42 0 66 */ +&(nid_objs[585]),/* OBJ_setct_CapRevResTBE 2 23 42 0 67 */ +&(nid_objs[586]),/* OBJ_setct_CredReqTBE 2 23 42 0 68 */ +&(nid_objs[587]),/* OBJ_setct_CredReqTBEX 2 23 42 0 69 */ +&(nid_objs[588]),/* OBJ_setct_CredResTBE 2 23 42 0 70 */ +&(nid_objs[589]),/* OBJ_setct_CredRevReqTBE 2 23 42 0 71 */ +&(nid_objs[590]),/* OBJ_setct_CredRevReqTBEX 2 23 42 0 72 */ +&(nid_objs[591]),/* OBJ_setct_CredRevResTBE 2 23 42 0 73 */ +&(nid_objs[592]),/* OBJ_setct_BatchAdminReqTBE 2 23 42 0 74 */ +&(nid_objs[593]),/* OBJ_setct_BatchAdminResTBE 2 23 42 0 75 */ +&(nid_objs[594]),/* OBJ_setct_RegFormReqTBE 2 23 42 0 76 */ +&(nid_objs[595]),/* OBJ_setct_CertReqTBE 2 23 42 0 77 */ +&(nid_objs[596]),/* OBJ_setct_CertReqTBEX 2 23 42 0 78 */ +&(nid_objs[597]),/* OBJ_setct_CertResTBE 2 23 42 0 79 */ +&(nid_objs[598]),/* OBJ_setct_CRLNotificationTBS 2 23 42 0 80 */ +&(nid_objs[599]),/* OBJ_setct_CRLNotificationResTBS 2 23 42 0 81 */ +&(nid_objs[600]),/* OBJ_setct_BCIDistributionTBS 2 23 42 0 82 */ +&(nid_objs[601]),/* OBJ_setext_genCrypt 2 23 42 1 1 */ +&(nid_objs[602]),/* OBJ_setext_miAuth 2 23 42 1 3 */ +&(nid_objs[603]),/* OBJ_setext_pinSecure 2 23 42 1 4 */ +&(nid_objs[604]),/* OBJ_setext_pinAny 2 23 42 1 5 */ +&(nid_objs[605]),/* OBJ_setext_track2 2 23 42 1 7 */ +&(nid_objs[606]),/* OBJ_setext_cv 2 23 42 1 8 */ +&(nid_objs[620]),/* OBJ_setAttr_Cert 2 23 42 3 0 */ +&(nid_objs[621]),/* OBJ_setAttr_PGWYcap 2 23 42 3 1 */ +&(nid_objs[622]),/* OBJ_setAttr_TokenType 2 23 42 3 2 */ +&(nid_objs[623]),/* OBJ_setAttr_IssCap 2 23 42 3 3 */ +&(nid_objs[607]),/* OBJ_set_policy_root 2 23 42 5 0 */ +&(nid_objs[608]),/* OBJ_setCext_hashedRoot 2 23 42 7 0 */ +&(nid_objs[609]),/* OBJ_setCext_certType 2 23 42 7 1 */ +&(nid_objs[610]),/* OBJ_setCext_merchData 2 23 42 7 2 */ +&(nid_objs[611]),/* OBJ_setCext_cCertRequired 2 23 42 7 3 */ +&(nid_objs[612]),/* OBJ_setCext_tunneling 2 23 42 7 4 */ +&(nid_objs[613]),/* OBJ_setCext_setExt 2 23 42 7 5 */ +&(nid_objs[614]),/* OBJ_setCext_setQualf 2 23 42 7 6 */ +&(nid_objs[615]),/* OBJ_setCext_PGWYcapabilities 2 23 42 7 7 */ +&(nid_objs[616]),/* OBJ_setCext_TokenIdentifier 2 23 42 7 8 */ +&(nid_objs[617]),/* OBJ_setCext_Track2Data 2 23 42 7 9 */ +&(nid_objs[618]),/* OBJ_setCext_TokenType 2 23 42 7 10 */ +&(nid_objs[619]),/* OBJ_setCext_IssuerCapabilities 2 23 42 7 11 */ +&(nid_objs[636]),/* OBJ_set_brand_IATA_ATA 2 23 42 8 1 */ +&(nid_objs[640]),/* OBJ_set_brand_Visa 2 23 42 8 4 */ +&(nid_objs[641]),/* OBJ_set_brand_MasterCard 2 23 42 8 5 */ +&(nid_objs[637]),/* OBJ_set_brand_Diners 2 23 42 8 30 */ +&(nid_objs[638]),/* OBJ_set_brand_AmericanExpress 2 23 42 8 34 */ +&(nid_objs[639]),/* OBJ_set_brand_JCB 2 23 42 8 35 */ &(nid_objs[184]),/* OBJ_X9_57 1 2 840 10040 */ &(nid_objs[405]),/* OBJ_ansi_X9_62 1 2 840 10045 */ &(nid_objs[389]),/* OBJ_Enterprises 1 3 6 1 4 1 */ -&(nid_objs[569]),/* OBJ_mime_mhs 1 3 6 1 7 1 */ +&(nid_objs[504]),/* OBJ_mime_mhs 1 3 6 1 7 1 */ &(nid_objs[104]),/* OBJ_md5WithRSA 1 3 14 3 2 3 */ &(nid_objs[29]),/* OBJ_des_ecb 1 3 14 3 2 6 */ &(nid_objs[31]),/* OBJ_des_cbc 1 3 14 3 2 7 */ @@ -3631,69 +3640,69 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[115]),/* OBJ_sha1WithRSA 1 3 14 3 2 29 */ &(nid_objs[117]),/* OBJ_ripemd160 1 3 36 3 2 1 */ &(nid_objs[143]),/* OBJ_sxnet 1 3 101 1 4 1 */ -&(nid_objs[548]),/* OBJ_sect163k1 1 3 132 0 1 */ -&(nid_objs[549]),/* OBJ_sect163r1 1 3 132 0 2 */ -&(nid_objs[555]),/* OBJ_sect239k1 1 3 132 0 3 */ -&(nid_objs[544]),/* OBJ_sect113r1 1 3 132 0 4 */ -&(nid_objs[545]),/* OBJ_sect113r2 1 3 132 0 5 */ -&(nid_objs[529]),/* OBJ_secp112r1 1 3 132 0 6 */ -&(nid_objs[530]),/* OBJ_secp112r2 1 3 132 0 7 */ -&(nid_objs[534]),/* OBJ_secp160r1 1 3 132 0 8 */ -&(nid_objs[533]),/* OBJ_secp160k1 1 3 132 0 9 */ -&(nid_objs[540]),/* OBJ_secp256k1 1 3 132 0 10 */ -&(nid_objs[550]),/* OBJ_sect163r2 1 3 132 0 15 */ -&(nid_objs[556]),/* OBJ_sect283k1 1 3 132 0 16 */ -&(nid_objs[557]),/* OBJ_sect283r1 1 3 132 0 17 */ -&(nid_objs[546]),/* OBJ_sect131r1 1 3 132 0 22 */ -&(nid_objs[547]),/* OBJ_sect131r2 1 3 132 0 23 */ -&(nid_objs[551]),/* OBJ_sect193r1 1 3 132 0 24 */ -&(nid_objs[552]),/* OBJ_sect193r2 1 3 132 0 25 */ -&(nid_objs[553]),/* OBJ_sect233k1 1 3 132 0 26 */ -&(nid_objs[554]),/* OBJ_sect233r1 1 3 132 0 27 */ -&(nid_objs[531]),/* OBJ_secp128r1 1 3 132 0 28 */ -&(nid_objs[532]),/* OBJ_secp128r2 1 3 132 0 29 */ -&(nid_objs[535]),/* OBJ_secp160r2 1 3 132 0 30 */ -&(nid_objs[536]),/* OBJ_secp192k1 1 3 132 0 31 */ -&(nid_objs[538]),/* OBJ_secp224k1 1 3 132 0 32 */ -&(nid_objs[539]),/* OBJ_secp224r1 1 3 132 0 33 */ -&(nid_objs[542]),/* OBJ_secp384r1 1 3 132 0 34 */ -&(nid_objs[543]),/* OBJ_secp521r1 1 3 132 0 35 */ -&(nid_objs[558]),/* OBJ_sect409k1 1 3 132 0 36 */ -&(nid_objs[559]),/* OBJ_sect409r1 1 3 132 0 37 */ -&(nid_objs[560]),/* OBJ_sect571k1 1 3 132 0 38 */ -&(nid_objs[561]),/* OBJ_sect571r1 1 3 132 0 39 */ -&(nid_objs[688]),/* OBJ_set_rootKeyThumb 2 23 42 3 0 0 */ -&(nid_objs[689]),/* OBJ_set_addPolicy 2 23 42 3 0 1 */ -&(nid_objs[690]),/* OBJ_setAttr_Token_EMV 2 23 42 3 2 1 */ -&(nid_objs[691]),/* OBJ_setAttr_Token_B0Prime 2 23 42 3 2 2 */ -&(nid_objs[692]),/* OBJ_setAttr_IssCap_CVM 2 23 42 3 3 3 */ -&(nid_objs[693]),/* OBJ_setAttr_IssCap_T2 2 23 42 3 3 4 */ -&(nid_objs[694]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */ -&(nid_objs[706]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */ -&(nid_objs[564]),/* OBJ_wap_wsg_idm_ecid_wtls1 2 23 43 13 4 1 */ -&(nid_objs[709]),/* OBJ_wap_wsg_idm_ecid_wtls3 2 23 43 13 4 3 */ -&(nid_objs[710]),/* OBJ_wap_wsg_idm_ecid_wtls4 2 23 43 13 4 4 */ -&(nid_objs[711]),/* OBJ_wap_wsg_idm_ecid_wtls5 2 23 43 13 4 5 */ -&(nid_objs[565]),/* OBJ_wap_wsg_idm_ecid_wtls6 2 23 43 13 4 6 */ -&(nid_objs[712]),/* OBJ_wap_wsg_idm_ecid_wtls7 2 23 43 13 4 7 */ -&(nid_objs[566]),/* OBJ_wap_wsg_idm_ecid_wtls8 2 23 43 13 4 8 */ -&(nid_objs[567]),/* OBJ_wap_wsg_idm_ecid_wtls9 2 23 43 13 4 9 */ -&(nid_objs[713]),/* OBJ_wap_wsg_idm_ecid_wtls10 2 23 43 13 4 10 */ -&(nid_objs[714]),/* OBJ_wap_wsg_idm_ecid_wtls11 2 23 43 13 4 11 */ -&(nid_objs[715]),/* OBJ_wap_wsg_idm_ecid_wtls12 2 23 43 13 4 12 */ +&(nid_objs[707]),/* OBJ_sect163k1 1 3 132 0 1 */ +&(nid_objs[708]),/* OBJ_sect163r1 1 3 132 0 2 */ +&(nid_objs[714]),/* OBJ_sect239k1 1 3 132 0 3 */ +&(nid_objs[703]),/* OBJ_sect113r1 1 3 132 0 4 */ +&(nid_objs[704]),/* OBJ_sect113r2 1 3 132 0 5 */ +&(nid_objs[690]),/* OBJ_secp112r1 1 3 132 0 6 */ +&(nid_objs[691]),/* OBJ_secp112r2 1 3 132 0 7 */ +&(nid_objs[695]),/* OBJ_secp160r1 1 3 132 0 8 */ +&(nid_objs[694]),/* OBJ_secp160k1 1 3 132 0 9 */ +&(nid_objs[700]),/* OBJ_secp256k1 1 3 132 0 10 */ +&(nid_objs[709]),/* OBJ_sect163r2 1 3 132 0 15 */ +&(nid_objs[715]),/* OBJ_sect283k1 1 3 132 0 16 */ +&(nid_objs[716]),/* OBJ_sect283r1 1 3 132 0 17 */ +&(nid_objs[705]),/* OBJ_sect131r1 1 3 132 0 22 */ +&(nid_objs[706]),/* OBJ_sect131r2 1 3 132 0 23 */ +&(nid_objs[710]),/* OBJ_sect193r1 1 3 132 0 24 */ +&(nid_objs[711]),/* OBJ_sect193r2 1 3 132 0 25 */ +&(nid_objs[712]),/* OBJ_sect233k1 1 3 132 0 26 */ +&(nid_objs[713]),/* OBJ_sect233r1 1 3 132 0 27 */ +&(nid_objs[692]),/* OBJ_secp128r1 1 3 132 0 28 */ +&(nid_objs[693]),/* OBJ_secp128r2 1 3 132 0 29 */ +&(nid_objs[696]),/* OBJ_secp160r2 1 3 132 0 30 */ +&(nid_objs[697]),/* OBJ_secp192k1 1 3 132 0 31 */ +&(nid_objs[698]),/* OBJ_secp224k1 1 3 132 0 32 */ +&(nid_objs[699]),/* OBJ_secp224r1 1 3 132 0 33 */ +&(nid_objs[701]),/* OBJ_secp384r1 1 3 132 0 34 */ +&(nid_objs[702]),/* OBJ_secp521r1 1 3 132 0 35 */ +&(nid_objs[717]),/* OBJ_sect409k1 1 3 132 0 36 */ +&(nid_objs[718]),/* OBJ_sect409r1 1 3 132 0 37 */ +&(nid_objs[719]),/* OBJ_sect571k1 1 3 132 0 38 */ +&(nid_objs[720]),/* OBJ_sect571r1 1 3 132 0 39 */ +&(nid_objs[624]),/* OBJ_set_rootKeyThumb 2 23 42 3 0 0 */ +&(nid_objs[625]),/* OBJ_set_addPolicy 2 23 42 3 0 1 */ +&(nid_objs[626]),/* OBJ_setAttr_Token_EMV 2 23 42 3 2 1 */ +&(nid_objs[627]),/* OBJ_setAttr_Token_B0Prime 2 23 42 3 2 2 */ +&(nid_objs[628]),/* OBJ_setAttr_IssCap_CVM 2 23 42 3 3 3 */ +&(nid_objs[629]),/* OBJ_setAttr_IssCap_T2 2 23 42 3 3 4 */ +&(nid_objs[630]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */ +&(nid_objs[642]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */ +&(nid_objs[721]),/* OBJ_wap_wsg_idm_ecid_wtls1 2 23 43 13 4 1 */ +&(nid_objs[722]),/* OBJ_wap_wsg_idm_ecid_wtls3 2 23 43 13 4 3 */ +&(nid_objs[723]),/* OBJ_wap_wsg_idm_ecid_wtls4 2 23 43 13 4 4 */ +&(nid_objs[724]),/* OBJ_wap_wsg_idm_ecid_wtls5 2 23 43 13 4 5 */ +&(nid_objs[725]),/* OBJ_wap_wsg_idm_ecid_wtls6 2 23 43 13 4 6 */ +&(nid_objs[726]),/* OBJ_wap_wsg_idm_ecid_wtls7 2 23 43 13 4 7 */ +&(nid_objs[727]),/* OBJ_wap_wsg_idm_ecid_wtls8 2 23 43 13 4 8 */ +&(nid_objs[728]),/* OBJ_wap_wsg_idm_ecid_wtls9 2 23 43 13 4 9 */ +&(nid_objs[729]),/* OBJ_wap_wsg_idm_ecid_wtls10 2 23 43 13 4 10 */ +&(nid_objs[730]),/* OBJ_wap_wsg_idm_ecid_wtls11 2 23 43 13 4 11 */ +&(nid_objs[731]),/* OBJ_wap_wsg_idm_ecid_wtls12 2 23 43 13 4 12 */ &(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */ &(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666 2 */ &(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */ &(nid_objs[185]),/* OBJ_X9cm 1 2 840 10040 4 */ &(nid_objs[127]),/* OBJ_id_pkix 1 3 6 1 5 5 7 */ -&(nid_objs[570]),/* OBJ_mime_mhs_headings 1 3 6 1 7 1 1 */ -&(nid_objs[571]),/* OBJ_mime_mhs_bodies 1 3 6 1 7 1 2 */ +&(nid_objs[505]),/* OBJ_mime_mhs_headings 1 3 6 1 7 1 1 */ +&(nid_objs[506]),/* OBJ_mime_mhs_bodies 1 3 6 1 7 1 2 */ &(nid_objs[119]),/* OBJ_ripemd160WithRSA 1 3 36 3 3 1 2 */ -&(nid_objs[695]),/* OBJ_setAttr_GenCryptgrm 2 23 42 3 3 3 1 */ -&(nid_objs[696]),/* OBJ_setAttr_T2Enc 2 23 42 3 3 4 1 */ -&(nid_objs[697]),/* OBJ_setAttr_T2cleartxt 2 23 42 3 3 4 2 */ -&(nid_objs[698]),/* OBJ_setAttr_TokICCsig 2 23 42 3 3 5 1 */ -&(nid_objs[699]),/* OBJ_setAttr_SecDevSig 2 23 42 3 3 5 2 */ +&(nid_objs[631]),/* OBJ_setAttr_GenCryptgrm 2 23 42 3 3 3 1 */ +&(nid_objs[632]),/* OBJ_setAttr_T2Enc 2 23 42 3 3 4 1 */ +&(nid_objs[633]),/* OBJ_setAttr_T2cleartxt 2 23 42 3 3 4 2 */ +&(nid_objs[634]),/* OBJ_setAttr_TokICCsig 2 23 42 3 3 5 1 */ +&(nid_objs[635]),/* OBJ_setAttr_SecDevSig 2 23 42 3 3 5 2 */ &(nid_objs[436]),/* OBJ_ucl 0 9 2342 19200300 */ &(nid_objs[ 2]),/* OBJ_pkcs 1 2 840 113549 1 */ &(nid_objs[431]),/* OBJ_hold_instruction_none 1 2 840 10040 2 1 */ @@ -3719,8 +3728,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[267]),/* OBJ_id_qcs 1 3 6 1 5 5 7 11 */ &(nid_objs[268]),/* OBJ_id_cct 1 3 6 1 5 5 7 12 */ &(nid_objs[176]),/* OBJ_id_ad 1 3 6 1 5 5 7 48 */ -&(nid_objs[572]),/* OBJ_id_hex_partial_message 1 3 6 1 7 1 1 1 */ -&(nid_objs[573]),/* OBJ_id_hex_multipart_message 1 3 6 1 7 1 1 2 */ +&(nid_objs[507]),/* OBJ_id_hex_partial_message 1 3 6 1 7 1 1 1 */ +&(nid_objs[508]),/* OBJ_id_hex_multipart_message 1 3 6 1 7 1 1 2 */ &(nid_objs[57]),/* OBJ_netscape 2 16 840 1 113730 */ &(nid_objs[437]),/* OBJ_pilot 0 9 2342 19200300 100 */ &(nid_objs[186]),/* OBJ_pkcs1 1 2 840 113549 1 1 */ @@ -3736,28 +3745,28 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[ 5]),/* OBJ_rc4 1 2 840 113549 3 4 */ &(nid_objs[44]),/* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */ &(nid_objs[120]),/* OBJ_rc5_cbc 1 2 840 113549 3 8 */ -&(nid_objs[707]),/* OBJ_des_cdmf 1 2 840 113549 3 10 */ -&(nid_objs[503]),/* OBJ_X9_62_id_characteristic_two_basis 1 2 840 10045 1 2 3 */ -&(nid_objs[507]),/* OBJ_X9_62_c2pnb163v1 1 2 840 10045 3 0 1 */ -&(nid_objs[508]),/* OBJ_X9_62_c2pnb163v2 1 2 840 10045 3 0 2 */ -&(nid_objs[509]),/* OBJ_X9_62_c2pnb163v3 1 2 840 10045 3 0 3 */ -&(nid_objs[510]),/* OBJ_X9_62_c2pnb176v1 1 2 840 10045 3 0 4 */ -&(nid_objs[511]),/* OBJ_X9_62_c2tnb191v1 1 2 840 10045 3 0 5 */ -&(nid_objs[512]),/* OBJ_X9_62_c2tnb191v2 1 2 840 10045 3 0 6 */ -&(nid_objs[513]),/* OBJ_X9_62_c2tnb191v3 1 2 840 10045 3 0 7 */ -&(nid_objs[514]),/* OBJ_X9_62_c2onb191v4 1 2 840 10045 3 0 8 */ -&(nid_objs[515]),/* OBJ_X9_62_c2onb191v5 1 2 840 10045 3 0 9 */ -&(nid_objs[516]),/* OBJ_X9_62_c2pnb208w1 1 2 840 10045 3 0 10 */ -&(nid_objs[517]),/* OBJ_X9_62_c2tnb239v1 1 2 840 10045 3 0 11 */ -&(nid_objs[518]),/* OBJ_X9_62_c2tnb239v2 1 2 840 10045 3 0 12 */ -&(nid_objs[519]),/* OBJ_X9_62_c2tnb239v3 1 2 840 10045 3 0 13 */ -&(nid_objs[520]),/* OBJ_X9_62_c2onb239v4 1 2 840 10045 3 0 14 */ -&(nid_objs[521]),/* OBJ_X9_62_c2onb239v5 1 2 840 10045 3 0 15 */ -&(nid_objs[522]),/* OBJ_X9_62_c2pnb272w1 1 2 840 10045 3 0 16 */ -&(nid_objs[523]),/* OBJ_X9_62_c2pnb304w1 1 2 840 10045 3 0 17 */ -&(nid_objs[524]),/* OBJ_X9_62_c2tnb359v1 1 2 840 10045 3 0 18 */ -&(nid_objs[525]),/* OBJ_X9_62_c2pnb368w1 1 2 840 10045 3 0 19 */ -&(nid_objs[526]),/* OBJ_X9_62_c2tnb431r1 1 2 840 10045 3 0 20 */ +&(nid_objs[643]),/* OBJ_des_cdmf 1 2 840 113549 3 10 */ +&(nid_objs[666]),/* OBJ_X9_62_id_characteristic_two_basis 1 2 840 10045 1 2 3 */ +&(nid_objs[670]),/* OBJ_X9_62_c2pnb163v1 1 2 840 10045 3 0 1 */ +&(nid_objs[671]),/* OBJ_X9_62_c2pnb163v2 1 2 840 10045 3 0 2 */ +&(nid_objs[672]),/* OBJ_X9_62_c2pnb163v3 1 2 840 10045 3 0 3 */ +&(nid_objs[673]),/* OBJ_X9_62_c2pnb176v1 1 2 840 10045 3 0 4 */ +&(nid_objs[674]),/* OBJ_X9_62_c2tnb191v1 1 2 840 10045 3 0 5 */ +&(nid_objs[675]),/* OBJ_X9_62_c2tnb191v2 1 2 840 10045 3 0 6 */ +&(nid_objs[676]),/* OBJ_X9_62_c2tnb191v3 1 2 840 10045 3 0 7 */ +&(nid_objs[677]),/* OBJ_X9_62_c2onb191v4 1 2 840 10045 3 0 8 */ +&(nid_objs[678]),/* OBJ_X9_62_c2onb191v5 1 2 840 10045 3 0 9 */ +&(nid_objs[679]),/* OBJ_X9_62_c2pnb208w1 1 2 840 10045 3 0 10 */ +&(nid_objs[680]),/* OBJ_X9_62_c2tnb239v1 1 2 840 10045 3 0 11 */ +&(nid_objs[681]),/* OBJ_X9_62_c2tnb239v2 1 2 840 10045 3 0 12 */ +&(nid_objs[682]),/* OBJ_X9_62_c2tnb239v3 1 2 840 10045 3 0 13 */ +&(nid_objs[683]),/* OBJ_X9_62_c2onb239v4 1 2 840 10045 3 0 14 */ +&(nid_objs[684]),/* OBJ_X9_62_c2onb239v5 1 2 840 10045 3 0 15 */ +&(nid_objs[685]),/* OBJ_X9_62_c2pnb272w1 1 2 840 10045 3 0 16 */ +&(nid_objs[686]),/* OBJ_X9_62_c2pnb304w1 1 2 840 10045 3 0 17 */ +&(nid_objs[687]),/* OBJ_X9_62_c2tnb359v1 1 2 840 10045 3 0 18 */ +&(nid_objs[688]),/* OBJ_X9_62_c2pnb368w1 1 2 840 10045 3 0 19 */ +&(nid_objs[689]),/* OBJ_X9_62_c2tnb431r1 1 2 840 10045 3 0 20 */ &(nid_objs[409]),/* OBJ_X9_62_prime192v1 1 2 840 10045 3 1 1 */ &(nid_objs[410]),/* OBJ_X9_62_prime192v2 1 2 840 10045 3 1 2 */ &(nid_objs[411]),/* OBJ_X9_62_prime192v3 1 2 840 10045 3 1 3 */ @@ -3879,11 +3888,11 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[396]),/* OBJ_md4WithRSAEncryption 1 2 840 113549 1 1 3 */ &(nid_objs[ 8]),/* OBJ_md5WithRSAEncryption 1 2 840 113549 1 1 4 */ &(nid_objs[65]),/* OBJ_sha1WithRSAEncryption 1 2 840 113549 1 1 5 */ -&(nid_objs[708]),/* OBJ_rsaOAEPEncryptionSET 1 2 840 113549 1 1 6 */ -&(nid_objs[737]),/* OBJ_sha256WithRSAEncryption 1 2 840 113549 1 1 11 */ -&(nid_objs[738]),/* OBJ_sha384WithRSAEncryption 1 2 840 113549 1 1 12 */ -&(nid_objs[739]),/* OBJ_sha512WithRSAEncryption 1 2 840 113549 1 1 13 */ -&(nid_objs[740]),/* OBJ_sha224WithRSAEncryption 1 2 840 113549 1 1 14 */ +&(nid_objs[644]),/* OBJ_rsaOAEPEncryptionSET 1 2 840 113549 1 1 6 */ +&(nid_objs[732]),/* OBJ_sha256WithRSAEncryption 1 2 840 113549 1 1 11 */ +&(nid_objs[733]),/* OBJ_sha384WithRSAEncryption 1 2 840 113549 1 1 12 */ +&(nid_objs[734]),/* OBJ_sha512WithRSAEncryption 1 2 840 113549 1 1 13 */ +&(nid_objs[735]),/* OBJ_sha224WithRSAEncryption 1 2 840 113549 1 1 14 */ &(nid_objs[28]),/* OBJ_dhKeyAgreement 1 2 840 113549 1 3 1 */ &(nid_objs[ 9]),/* OBJ_pbeWithMD2AndDES_CBC 1 2 840 113549 1 5 1 */ &(nid_objs[10]),/* OBJ_pbeWithMD5AndDES_CBC 1 2 840 113549 1 5 3 */ @@ -3914,9 +3923,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[188]),/* OBJ_SMIME 1 2 840 113549 1 9 16 */ &(nid_objs[156]),/* OBJ_friendlyName 1 2 840 113549 1 9 20 */ &(nid_objs[157]),/* OBJ_localKeyID 1 2 840 113549 1 9 21 */ -&(nid_objs[504]),/* OBJ_X9_62_onBasis 1 2 840 10045 1 2 3 1 */ -&(nid_objs[505]),/* OBJ_X9_62_tpBasis 1 2 840 10045 1 2 3 2 */ -&(nid_objs[506]),/* OBJ_X9_62_ppBasis 1 2 840 10045 1 2 3 3 */ +&(nid_objs[667]),/* OBJ_X9_62_onBasis 1 2 840 10045 1 2 3 1 */ +&(nid_objs[668]),/* OBJ_X9_62_tpBasis 1 2 840 10045 1 2 3 2 */ +&(nid_objs[669]),/* OBJ_X9_62_ppBasis 1 2 840 10045 1 2 3 3 */ &(nid_objs[417]),/* OBJ_ms_csp_name 1 3 6 1 4 1 311 17 1 */ &(nid_objs[390]),/* OBJ_dcObject 1 3 6 1 4 1 1466 344 */ &(nid_objs[91]),/* OBJ_bf_cbc 1 3 6 1 4 1 3029 1 2 */ @@ -3951,10 +3960,10 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[427]),/* OBJ_aes_256_cbc 2 16 840 1 101 3 4 1 42 */ &(nid_objs[428]),/* OBJ_aes_256_ofb128 2 16 840 1 101 3 4 1 43 */ &(nid_objs[429]),/* OBJ_aes_256_cfb128 2 16 840 1 101 3 4 1 44 */ -&(nid_objs[741]),/* OBJ_sha256 2 16 840 1 101 3 4 2 1 */ -&(nid_objs[742]),/* OBJ_sha384 2 16 840 1 101 3 4 2 2 */ -&(nid_objs[743]),/* OBJ_sha512 2 16 840 1 101 3 4 2 3 */ -&(nid_objs[744]),/* OBJ_sha224 2 16 840 1 101 3 4 2 4 */ +&(nid_objs[740]),/* OBJ_sha256 2 16 840 1 101 3 4 2 1 */ +&(nid_objs[741]),/* OBJ_sha384 2 16 840 1 101 3 4 2 2 */ +&(nid_objs[742]),/* OBJ_sha512 2 16 840 1 101 3 4 2 3 */ +&(nid_objs[743]),/* OBJ_sha224 2 16 840 1 101 3 4 2 4 */ &(nid_objs[71]),/* OBJ_netscape_cert_type 2 16 840 1 113730 1 1 */ &(nid_objs[72]),/* OBJ_netscape_base_url 2 16 840 1 113730 1 2 */ &(nid_objs[73]),/* OBJ_netscape_revocation_url 2 16 840 1 113730 1 3 */ @@ -4050,8 +4059,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[136]),/* OBJ_ms_ctl_sign 1 3 6 1 4 1 311 10 3 1 */ &(nid_objs[137]),/* OBJ_ms_sgc 1 3 6 1 4 1 311 10 3 3 */ &(nid_objs[138]),/* OBJ_ms_efs 1 3 6 1 4 1 311 10 3 4 */ -&(nid_objs[716]),/* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */ -&(nid_objs[717]),/* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */ +&(nid_objs[648]),/* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */ +&(nid_objs[649]),/* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */ &(nid_objs[196]),/* OBJ_id_smime_mod_cms 1 2 840 113549 1 9 16 0 1 */ &(nid_objs[197]),/* OBJ_id_smime_mod_ess 1 2 840 113549 1 9 16 0 2 */ &(nid_objs[198]),/* OBJ_id_smime_mod_oid 1 2 840 113549 1 9 16 0 3 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 66bdf65f2..e53aadb6c 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -69,7 +69,7 @@ #define SN_itu_t "ITU-T" #define LN_itu_t "itu-t" -#define NID_itu_t 721 +#define NID_itu_t 645 #define OBJ_itu_t 0L #define NID_ccitt 404 @@ -82,7 +82,7 @@ #define SN_joint_iso_itu_t "JOINT-ISO-ITU-T" #define LN_joint_iso_itu_t "joint-iso-itu-t" -#define NID_joint_iso_itu_t 722 +#define NID_joint_iso_itu_t 646 #define OBJ_joint_iso_itu_t 2L #define NID_joint_iso_ccitt 393 @@ -94,24 +94,24 @@ #define OBJ_member_body OBJ_iso,2L #define SN_identified_organization "identified-organization" -#define NID_identified_organization 527 +#define NID_identified_organization 662 #define OBJ_identified_organization OBJ_iso,3L #define SN_certicom_arc "certicom-arc" -#define NID_certicom_arc 528 +#define NID_certicom_arc 663 #define OBJ_certicom_arc OBJ_identified_organization,132L #define SN_international_organizations "international-organizations" #define LN_international_organizations "International Organizations" -#define NID_international_organizations 723 +#define NID_international_organizations 647 #define OBJ_international_organizations OBJ_joint_iso_itu_t,23L #define SN_wap "wap" -#define NID_wap 562 +#define NID_wap 664 #define OBJ_wap OBJ_international_organizations,43L #define SN_wap_wsg "wap-wsg" -#define NID_wap_wsg 563 +#define NID_wap_wsg 665 #define OBJ_wap_wsg OBJ_wap,13L #define SN_selected_attribute_types "selected-attribute-types" @@ -164,19 +164,19 @@ #define OBJ_X9_62_characteristic_two_field OBJ_X9_62_id_fieldType,2L #define SN_X9_62_id_characteristic_two_basis "id-characteristic-two-basis" -#define NID_X9_62_id_characteristic_two_basis 503 +#define NID_X9_62_id_characteristic_two_basis 666 #define OBJ_X9_62_id_characteristic_two_basis OBJ_X9_62_characteristic_two_field,3L #define SN_X9_62_onBasis "onBasis" -#define NID_X9_62_onBasis 504 +#define NID_X9_62_onBasis 667 #define OBJ_X9_62_onBasis OBJ_X9_62_id_characteristic_two_basis,1L #define SN_X9_62_tpBasis "tpBasis" -#define NID_X9_62_tpBasis 505 +#define NID_X9_62_tpBasis 668 #define OBJ_X9_62_tpBasis OBJ_X9_62_id_characteristic_two_basis,2L #define SN_X9_62_ppBasis "ppBasis" -#define NID_X9_62_ppBasis 506 +#define NID_X9_62_ppBasis 669 #define OBJ_X9_62_ppBasis OBJ_X9_62_id_characteristic_two_basis,3L #define OBJ_X9_62_id_publicKeyType OBJ_ansi_X9_62,2L @@ -190,83 +190,83 @@ #define OBJ_X9_62_c_TwoCurve OBJ_X9_62_ellipticCurve,0L #define SN_X9_62_c2pnb163v1 "c2pnb163v1" -#define NID_X9_62_c2pnb163v1 507 +#define NID_X9_62_c2pnb163v1 670 #define OBJ_X9_62_c2pnb163v1 OBJ_X9_62_c_TwoCurve,1L #define SN_X9_62_c2pnb163v2 "c2pnb163v2" -#define NID_X9_62_c2pnb163v2 508 +#define NID_X9_62_c2pnb163v2 671 #define OBJ_X9_62_c2pnb163v2 OBJ_X9_62_c_TwoCurve,2L #define SN_X9_62_c2pnb163v3 "c2pnb163v3" -#define NID_X9_62_c2pnb163v3 509 +#define NID_X9_62_c2pnb163v3 672 #define OBJ_X9_62_c2pnb163v3 OBJ_X9_62_c_TwoCurve,3L #define SN_X9_62_c2pnb176v1 "c2pnb176v1" -#define NID_X9_62_c2pnb176v1 510 +#define NID_X9_62_c2pnb176v1 673 #define OBJ_X9_62_c2pnb176v1 OBJ_X9_62_c_TwoCurve,4L #define SN_X9_62_c2tnb191v1 "c2tnb191v1" -#define NID_X9_62_c2tnb191v1 511 +#define NID_X9_62_c2tnb191v1 674 #define OBJ_X9_62_c2tnb191v1 OBJ_X9_62_c_TwoCurve,5L #define SN_X9_62_c2tnb191v2 "c2tnb191v2" -#define NID_X9_62_c2tnb191v2 512 +#define NID_X9_62_c2tnb191v2 675 #define OBJ_X9_62_c2tnb191v2 OBJ_X9_62_c_TwoCurve,6L #define SN_X9_62_c2tnb191v3 "c2tnb191v3" -#define NID_X9_62_c2tnb191v3 513 +#define NID_X9_62_c2tnb191v3 676 #define OBJ_X9_62_c2tnb191v3 OBJ_X9_62_c_TwoCurve,7L #define SN_X9_62_c2onb191v4 "c2onb191v4" -#define NID_X9_62_c2onb191v4 514 +#define NID_X9_62_c2onb191v4 677 #define OBJ_X9_62_c2onb191v4 OBJ_X9_62_c_TwoCurve,8L #define SN_X9_62_c2onb191v5 "c2onb191v5" -#define NID_X9_62_c2onb191v5 515 +#define NID_X9_62_c2onb191v5 678 #define OBJ_X9_62_c2onb191v5 OBJ_X9_62_c_TwoCurve,9L #define SN_X9_62_c2pnb208w1 "c2pnb208w1" -#define NID_X9_62_c2pnb208w1 516 +#define NID_X9_62_c2pnb208w1 679 #define OBJ_X9_62_c2pnb208w1 OBJ_X9_62_c_TwoCurve,10L #define SN_X9_62_c2tnb239v1 "c2tnb239v1" -#define NID_X9_62_c2tnb239v1 517 +#define NID_X9_62_c2tnb239v1 680 #define OBJ_X9_62_c2tnb239v1 OBJ_X9_62_c_TwoCurve,11L #define SN_X9_62_c2tnb239v2 "c2tnb239v2" -#define NID_X9_62_c2tnb239v2 518 +#define NID_X9_62_c2tnb239v2 681 #define OBJ_X9_62_c2tnb239v2 OBJ_X9_62_c_TwoCurve,12L #define SN_X9_62_c2tnb239v3 "c2tnb239v3" -#define NID_X9_62_c2tnb239v3 519 +#define NID_X9_62_c2tnb239v3 682 #define OBJ_X9_62_c2tnb239v3 OBJ_X9_62_c_TwoCurve,13L #define SN_X9_62_c2onb239v4 "c2onb239v4" -#define NID_X9_62_c2onb239v4 520 +#define NID_X9_62_c2onb239v4 683 #define OBJ_X9_62_c2onb239v4 OBJ_X9_62_c_TwoCurve,14L #define SN_X9_62_c2onb239v5 "c2onb239v5" -#define NID_X9_62_c2onb239v5 521 +#define NID_X9_62_c2onb239v5 684 #define OBJ_X9_62_c2onb239v5 OBJ_X9_62_c_TwoCurve,15L #define SN_X9_62_c2pnb272w1 "c2pnb272w1" -#define NID_X9_62_c2pnb272w1 522 +#define NID_X9_62_c2pnb272w1 685 #define OBJ_X9_62_c2pnb272w1 OBJ_X9_62_c_TwoCurve,16L #define SN_X9_62_c2pnb304w1 "c2pnb304w1" -#define NID_X9_62_c2pnb304w1 523 +#define NID_X9_62_c2pnb304w1 686 #define OBJ_X9_62_c2pnb304w1 OBJ_X9_62_c_TwoCurve,17L #define SN_X9_62_c2tnb359v1 "c2tnb359v1" -#define NID_X9_62_c2tnb359v1 524 +#define NID_X9_62_c2tnb359v1 687 #define OBJ_X9_62_c2tnb359v1 OBJ_X9_62_c_TwoCurve,18L #define SN_X9_62_c2pnb368w1 "c2pnb368w1" -#define NID_X9_62_c2pnb368w1 525 +#define NID_X9_62_c2pnb368w1 688 #define OBJ_X9_62_c2pnb368w1 OBJ_X9_62_c_TwoCurve,19L #define SN_X9_62_c2tnb431r1 "c2tnb431r1" -#define NID_X9_62_c2tnb431r1 526 +#define NID_X9_62_c2tnb431r1 689 #define OBJ_X9_62_c2tnb431r1 OBJ_X9_62_c_TwoCurve,20L #define OBJ_X9_62_primeCurve OBJ_X9_62_ellipticCurve,1L @@ -308,173 +308,173 @@ #define OBJ_secg_ellipticCurve OBJ_certicom_arc,0L #define SN_secp112r1 "secp112r1" -#define NID_secp112r1 529 +#define NID_secp112r1 690 #define OBJ_secp112r1 OBJ_secg_ellipticCurve,6L #define SN_secp112r2 "secp112r2" -#define NID_secp112r2 530 +#define NID_secp112r2 691 #define OBJ_secp112r2 OBJ_secg_ellipticCurve,7L #define SN_secp128r1 "secp128r1" -#define NID_secp128r1 531 +#define NID_secp128r1 692 #define OBJ_secp128r1 OBJ_secg_ellipticCurve,28L #define SN_secp128r2 "secp128r2" -#define NID_secp128r2 532 +#define NID_secp128r2 693 #define OBJ_secp128r2 OBJ_secg_ellipticCurve,29L #define SN_secp160k1 "secp160k1" -#define NID_secp160k1 533 +#define NID_secp160k1 694 #define OBJ_secp160k1 OBJ_secg_ellipticCurve,9L #define SN_secp160r1 "secp160r1" -#define NID_secp160r1 534 +#define NID_secp160r1 695 #define OBJ_secp160r1 OBJ_secg_ellipticCurve,8L #define SN_secp160r2 "secp160r2" -#define NID_secp160r2 535 +#define NID_secp160r2 696 #define OBJ_secp160r2 OBJ_secg_ellipticCurve,30L #define SN_secp192k1 "secp192k1" -#define NID_secp192k1 536 +#define NID_secp192k1 697 #define OBJ_secp192k1 OBJ_secg_ellipticCurve,31L #define SN_secp224k1 "secp224k1" -#define NID_secp224k1 538 +#define NID_secp224k1 698 #define OBJ_secp224k1 OBJ_secg_ellipticCurve,32L #define SN_secp224r1 "secp224r1" -#define NID_secp224r1 539 +#define NID_secp224r1 699 #define OBJ_secp224r1 OBJ_secg_ellipticCurve,33L #define SN_secp256k1 "secp256k1" -#define NID_secp256k1 540 +#define NID_secp256k1 700 #define OBJ_secp256k1 OBJ_secg_ellipticCurve,10L #define SN_secp384r1 "secp384r1" -#define NID_secp384r1 542 +#define NID_secp384r1 701 #define OBJ_secp384r1 OBJ_secg_ellipticCurve,34L #define SN_secp521r1 "secp521r1" -#define NID_secp521r1 543 +#define NID_secp521r1 702 #define OBJ_secp521r1 OBJ_secg_ellipticCurve,35L #define SN_sect113r1 "sect113r1" -#define NID_sect113r1 544 +#define NID_sect113r1 703 #define OBJ_sect113r1 OBJ_secg_ellipticCurve,4L #define SN_sect113r2 "sect113r2" -#define NID_sect113r2 545 +#define NID_sect113r2 704 #define OBJ_sect113r2 OBJ_secg_ellipticCurve,5L #define SN_sect131r1 "sect131r1" -#define NID_sect131r1 546 +#define NID_sect131r1 705 #define OBJ_sect131r1 OBJ_secg_ellipticCurve,22L #define SN_sect131r2 "sect131r2" -#define NID_sect131r2 547 +#define NID_sect131r2 706 #define OBJ_sect131r2 OBJ_secg_ellipticCurve,23L #define SN_sect163k1 "sect163k1" -#define NID_sect163k1 548 +#define NID_sect163k1 707 #define OBJ_sect163k1 OBJ_secg_ellipticCurve,1L #define SN_sect163r1 "sect163r1" -#define NID_sect163r1 549 +#define NID_sect163r1 708 #define OBJ_sect163r1 OBJ_secg_ellipticCurve,2L #define SN_sect163r2 "sect163r2" -#define NID_sect163r2 550 +#define NID_sect163r2 709 #define OBJ_sect163r2 OBJ_secg_ellipticCurve,15L #define SN_sect193r1 "sect193r1" -#define NID_sect193r1 551 +#define NID_sect193r1 710 #define OBJ_sect193r1 OBJ_secg_ellipticCurve,24L #define SN_sect193r2 "sect193r2" -#define NID_sect193r2 552 +#define NID_sect193r2 711 #define OBJ_sect193r2 OBJ_secg_ellipticCurve,25L #define SN_sect233k1 "sect233k1" -#define NID_sect233k1 553 +#define NID_sect233k1 712 #define OBJ_sect233k1 OBJ_secg_ellipticCurve,26L #define SN_sect233r1 "sect233r1" -#define NID_sect233r1 554 +#define NID_sect233r1 713 #define OBJ_sect233r1 OBJ_secg_ellipticCurve,27L #define SN_sect239k1 "sect239k1" -#define NID_sect239k1 555 +#define NID_sect239k1 714 #define OBJ_sect239k1 OBJ_secg_ellipticCurve,3L #define SN_sect283k1 "sect283k1" -#define NID_sect283k1 556 +#define NID_sect283k1 715 #define OBJ_sect283k1 OBJ_secg_ellipticCurve,16L #define SN_sect283r1 "sect283r1" -#define NID_sect283r1 557 +#define NID_sect283r1 716 #define OBJ_sect283r1 OBJ_secg_ellipticCurve,17L #define SN_sect409k1 "sect409k1" -#define NID_sect409k1 558 +#define NID_sect409k1 717 #define OBJ_sect409k1 OBJ_secg_ellipticCurve,36L #define SN_sect409r1 "sect409r1" -#define NID_sect409r1 559 +#define NID_sect409r1 718 #define OBJ_sect409r1 OBJ_secg_ellipticCurve,37L #define SN_sect571k1 "sect571k1" -#define NID_sect571k1 560 +#define NID_sect571k1 719 #define OBJ_sect571k1 OBJ_secg_ellipticCurve,38L #define SN_sect571r1 "sect571r1" -#define NID_sect571r1 561 +#define NID_sect571r1 720 #define OBJ_sect571r1 OBJ_secg_ellipticCurve,39L #define OBJ_wap_wsg_idm_ecid OBJ_wap_wsg,4L #define SN_wap_wsg_idm_ecid_wtls1 "wap-wsg-idm-ecid-wtls1" -#define NID_wap_wsg_idm_ecid_wtls1 564 +#define NID_wap_wsg_idm_ecid_wtls1 721 #define OBJ_wap_wsg_idm_ecid_wtls1 OBJ_wap_wsg_idm_ecid,1L #define SN_wap_wsg_idm_ecid_wtls3 "wap-wsg-idm-ecid-wtls3" -#define NID_wap_wsg_idm_ecid_wtls3 709 +#define NID_wap_wsg_idm_ecid_wtls3 722 #define OBJ_wap_wsg_idm_ecid_wtls3 OBJ_wap_wsg_idm_ecid,3L #define SN_wap_wsg_idm_ecid_wtls4 "wap-wsg-idm-ecid-wtls4" -#define NID_wap_wsg_idm_ecid_wtls4 710 +#define NID_wap_wsg_idm_ecid_wtls4 723 #define OBJ_wap_wsg_idm_ecid_wtls4 OBJ_wap_wsg_idm_ecid,4L #define SN_wap_wsg_idm_ecid_wtls5 "wap-wsg-idm-ecid-wtls5" -#define NID_wap_wsg_idm_ecid_wtls5 711 +#define NID_wap_wsg_idm_ecid_wtls5 724 #define OBJ_wap_wsg_idm_ecid_wtls5 OBJ_wap_wsg_idm_ecid,5L #define SN_wap_wsg_idm_ecid_wtls6 "wap-wsg-idm-ecid-wtls6" -#define NID_wap_wsg_idm_ecid_wtls6 565 +#define NID_wap_wsg_idm_ecid_wtls6 725 #define OBJ_wap_wsg_idm_ecid_wtls6 OBJ_wap_wsg_idm_ecid,6L #define SN_wap_wsg_idm_ecid_wtls7 "wap-wsg-idm-ecid-wtls7" -#define NID_wap_wsg_idm_ecid_wtls7 712 +#define NID_wap_wsg_idm_ecid_wtls7 726 #define OBJ_wap_wsg_idm_ecid_wtls7 OBJ_wap_wsg_idm_ecid,7L #define SN_wap_wsg_idm_ecid_wtls8 "wap-wsg-idm-ecid-wtls8" -#define NID_wap_wsg_idm_ecid_wtls8 566 +#define NID_wap_wsg_idm_ecid_wtls8 727 #define OBJ_wap_wsg_idm_ecid_wtls8 OBJ_wap_wsg_idm_ecid,8L #define SN_wap_wsg_idm_ecid_wtls9 "wap-wsg-idm-ecid-wtls9" -#define NID_wap_wsg_idm_ecid_wtls9 567 +#define NID_wap_wsg_idm_ecid_wtls9 728 #define OBJ_wap_wsg_idm_ecid_wtls9 OBJ_wap_wsg_idm_ecid,9L #define SN_wap_wsg_idm_ecid_wtls10 "wap-wsg-idm-ecid-wtls10" -#define NID_wap_wsg_idm_ecid_wtls10 713 +#define NID_wap_wsg_idm_ecid_wtls10 729 #define OBJ_wap_wsg_idm_ecid_wtls10 OBJ_wap_wsg_idm_ecid,10L #define SN_wap_wsg_idm_ecid_wtls11 "wap-wsg-idm-ecid-wtls11" -#define NID_wap_wsg_idm_ecid_wtls11 714 +#define NID_wap_wsg_idm_ecid_wtls11 730 #define OBJ_wap_wsg_idm_ecid_wtls11 OBJ_wap_wsg_idm_ecid,11L #define SN_wap_wsg_idm_ecid_wtls12 "wap-wsg-idm-ecid-wtls12" -#define NID_wap_wsg_idm_ecid_wtls12 715 +#define NID_wap_wsg_idm_ecid_wtls12 731 #define OBJ_wap_wsg_idm_ecid_wtls12 OBJ_wap_wsg_idm_ecid,12L #define SN_cast5_cbc "CAST5-CBC" @@ -538,22 +538,22 @@ #define SN_sha256WithRSAEncryption "RSA-SHA256" #define LN_sha256WithRSAEncryption "sha256WithRSAEncryption" -#define NID_sha256WithRSAEncryption 737 +#define NID_sha256WithRSAEncryption 732 #define OBJ_sha256WithRSAEncryption OBJ_pkcs1,11L #define SN_sha384WithRSAEncryption "RSA-SHA384" #define LN_sha384WithRSAEncryption "sha384WithRSAEncryption" -#define NID_sha384WithRSAEncryption 738 +#define NID_sha384WithRSAEncryption 733 #define OBJ_sha384WithRSAEncryption OBJ_pkcs1,12L #define SN_sha512WithRSAEncryption "RSA-SHA512" #define LN_sha512WithRSAEncryption "sha512WithRSAEncryption" -#define NID_sha512WithRSAEncryption 739 +#define NID_sha512WithRSAEncryption 734 #define OBJ_sha512WithRSAEncryption OBJ_pkcs1,13L #define SN_sha224WithRSAEncryption "RSA-SHA224" #define LN_sha224WithRSAEncryption "sha224WithRSAEncryption" -#define NID_sha224WithRSAEncryption 740 +#define NID_sha224WithRSAEncryption 735 #define OBJ_sha224WithRSAEncryption OBJ_pkcs1,14L #define SN_pkcs3 "pkcs3" @@ -1167,12 +1167,12 @@ #define SN_ms_smartcard_login "msSmartcardLogin" #define LN_ms_smartcard_login "Microsoft Smartcardlogin" -#define NID_ms_smartcard_login 716 +#define NID_ms_smartcard_login 648 #define OBJ_ms_smartcard_login 1L,3L,6L,1L,4L,1L,311L,20L,2L,2L #define SN_ms_upn "msUPN" #define LN_ms_upn "Microsoft Universal Principal Name" -#define NID_ms_upn 717 +#define NID_ms_upn 649 #define OBJ_ms_upn 1L,3L,6L,1L,4L,1L,311L,20L,2L,3L #define SN_idea_cbc "IDEA-CBC" @@ -1934,6 +1934,10 @@ #define NID_stateOrProvinceName 16 #define OBJ_stateOrProvinceName OBJ_X509,8L +#define LN_streetAddress "streetAddress" +#define NID_streetAddress 660 +#define OBJ_streetAddress OBJ_X509,9L + #define SN_organizationName "O" #define LN_organizationName "organizationName" #define NID_organizationName 17 @@ -1952,6 +1956,10 @@ #define NID_description 107 #define OBJ_description OBJ_X509,13L +#define LN_postalCode "postalCode" +#define NID_postalCode 661 +#define OBJ_postalCode OBJ_X509,17L + #define SN_name "name" #define LN_name "name" #define NID_name 173 @@ -1967,11 +1975,11 @@ #define OBJ_initials OBJ_X509,43L #define LN_generationQualifier "generationQualifier" -#define NID_generationQualifier 574 +#define NID_generationQualifier 509 #define OBJ_generationQualifier OBJ_X509,44L #define LN_x500UniqueIdentifier "x500UniqueIdentifier" -#define NID_x500UniqueIdentifier 568 +#define NID_x500UniqueIdentifier 503 #define OBJ_x500UniqueIdentifier OBJ_X509,45L #define SN_dnQualifier "dnQualifier" @@ -1980,7 +1988,7 @@ #define OBJ_dnQualifier OBJ_X509,46L #define LN_pseudonym "pseudonym" -#define NID_pseudonym 575 +#define NID_pseudonym 510 #define OBJ_pseudonym OBJ_X509,65L #define SN_role "role" @@ -2064,7 +2072,7 @@ #define SN_name_constraints "nameConstraints" #define LN_name_constraints "X509v3 Name Constraints" -#define NID_name_constraints 720 +#define NID_name_constraints 736 #define OBJ_name_constraints OBJ_id_ce,30L #define SN_crl_distribution_points "crlDistributionPoints" @@ -2079,12 +2087,12 @@ #define SN_any_policy "anyPolicy" #define LN_any_policy "X509v3 Any Policy" -#define NID_any_policy 718 +#define NID_any_policy 737 #define OBJ_any_policy OBJ_certificate_policies,0L #define SN_policy_mappings "policyMappings" #define LN_policy_mappings "X509v3 Policy Mappings" -#define NID_policy_mappings 719 +#define NID_policy_mappings 738 #define OBJ_policy_mappings OBJ_id_ce,33L #define SN_authority_key_identifier "authorityKeyIdentifier" @@ -2104,7 +2112,7 @@ #define SN_inhibit_any_policy "inhibitAnyPolicy" #define LN_inhibit_any_policy "X509v3 Inhibit Any Policy" -#define NID_inhibit_any_policy 736 +#define NID_inhibit_any_policy 739 #define OBJ_inhibit_any_policy OBJ_id_ce,54L #define SN_target_information "targetInformation" @@ -2245,27 +2253,27 @@ #define SN_mime_mhs "mime-mhs" #define LN_mime_mhs "MIME MHS" -#define NID_mime_mhs 569 +#define NID_mime_mhs 504 #define OBJ_mime_mhs OBJ_Mail,1L #define SN_mime_mhs_headings "mime-mhs-headings" #define LN_mime_mhs_headings "mime-mhs-headings" -#define NID_mime_mhs_headings 570 +#define NID_mime_mhs_headings 505 #define OBJ_mime_mhs_headings OBJ_mime_mhs,1L #define SN_mime_mhs_bodies "mime-mhs-bodies" #define LN_mime_mhs_bodies "mime-mhs-bodies" -#define NID_mime_mhs_bodies 571 +#define NID_mime_mhs_bodies 506 #define OBJ_mime_mhs_bodies OBJ_mime_mhs,2L #define SN_id_hex_partial_message "id-hex-partial-message" #define LN_id_hex_partial_message "id-hex-partial-message" -#define NID_id_hex_partial_message 572 +#define NID_id_hex_partial_message 507 #define OBJ_id_hex_partial_message OBJ_mime_mhs_headings,1L #define SN_id_hex_multipart_message "id-hex-multipart-message" #define LN_id_hex_multipart_message "id-hex-multipart-message" -#define NID_id_hex_multipart_message 573 +#define NID_id_hex_multipart_message 508 #define OBJ_id_hex_multipart_message OBJ_mime_mhs_headings,2L #define SN_rle_compression "RLE" @@ -2346,64 +2354,64 @@ #define SN_aes_128_cfb1 "AES-128-CFB1" #define LN_aes_128_cfb1 "aes-128-cfb1" -#define NID_aes_128_cfb1 726 +#define NID_aes_128_cfb1 650 #define SN_aes_192_cfb1 "AES-192-CFB1" #define LN_aes_192_cfb1 "aes-192-cfb1" -#define NID_aes_192_cfb1 727 +#define NID_aes_192_cfb1 651 #define SN_aes_256_cfb1 "AES-256-CFB1" #define LN_aes_256_cfb1 "aes-256-cfb1" -#define NID_aes_256_cfb1 728 +#define NID_aes_256_cfb1 652 #define SN_aes_128_cfb8 "AES-128-CFB8" #define LN_aes_128_cfb8 "aes-128-cfb8" -#define NID_aes_128_cfb8 729 +#define NID_aes_128_cfb8 653 #define SN_aes_192_cfb8 "AES-192-CFB8" #define LN_aes_192_cfb8 "aes-192-cfb8" -#define NID_aes_192_cfb8 730 +#define NID_aes_192_cfb8 654 #define SN_aes_256_cfb8 "AES-256-CFB8" #define LN_aes_256_cfb8 "aes-256-cfb8" -#define NID_aes_256_cfb8 731 +#define NID_aes_256_cfb8 655 #define SN_des_cfb1 "DES-CFB1" #define LN_des_cfb1 "des-cfb1" -#define NID_des_cfb1 732 +#define NID_des_cfb1 656 #define SN_des_cfb8 "DES-CFB8" #define LN_des_cfb8 "des-cfb8" -#define NID_des_cfb8 733 +#define NID_des_cfb8 657 #define SN_des_ede3_cfb1 "DES-EDE3-CFB1" #define LN_des_ede3_cfb1 "des-ede3-cfb1" -#define NID_des_ede3_cfb1 734 +#define NID_des_ede3_cfb1 658 #define SN_des_ede3_cfb8 "DES-EDE3-CFB8" #define LN_des_ede3_cfb8 "des-ede3-cfb8" -#define NID_des_ede3_cfb8 735 +#define NID_des_ede3_cfb8 659 #define OBJ_nist_hashalgs OBJ_nistAlgorithms,2L #define SN_sha256 "SHA256" #define LN_sha256 "sha256" -#define NID_sha256 741 +#define NID_sha256 740 #define OBJ_sha256 OBJ_nist_hashalgs,1L #define SN_sha384 "SHA384" #define LN_sha384 "sha384" -#define NID_sha384 742 +#define NID_sha384 741 #define OBJ_sha384 OBJ_nist_hashalgs,2L #define SN_sha512 "SHA512" #define LN_sha512 "sha512" -#define NID_sha512 743 +#define NID_sha512 742 #define OBJ_sha512 OBJ_nist_hashalgs,3L #define SN_sha224 "SHA224" #define LN_sha224 "sha224" -#define NID_sha224 744 +#define NID_sha224 743 #define OBJ_sha224 OBJ_nist_hashalgs,4L #define SN_hold_instruction_code "holdInstructionCode" @@ -2718,556 +2726,556 @@ #define SN_id_set "id-set" #define LN_id_set "Secure Electronic Transactions" -#define NID_id_set 576 +#define NID_id_set 512 #define OBJ_id_set OBJ_international_organizations,42L #define SN_set_ctype "set-ctype" #define LN_set_ctype "content types" -#define NID_set_ctype 577 +#define NID_set_ctype 513 #define OBJ_set_ctype OBJ_id_set,0L #define SN_set_msgExt "set-msgExt" #define LN_set_msgExt "message extensions" -#define NID_set_msgExt 578 +#define NID_set_msgExt 514 #define OBJ_set_msgExt OBJ_id_set,1L #define SN_set_attr "set-attr" -#define NID_set_attr 579 +#define NID_set_attr 515 #define OBJ_set_attr OBJ_id_set,3L #define SN_set_policy "set-policy" -#define NID_set_policy 580 +#define NID_set_policy 516 #define OBJ_set_policy OBJ_id_set,5L #define SN_set_certExt "set-certExt" #define LN_set_certExt "certificate extensions" -#define NID_set_certExt 581 +#define NID_set_certExt 517 #define OBJ_set_certExt OBJ_id_set,7L #define SN_set_brand "set-brand" -#define NID_set_brand 582 +#define NID_set_brand 518 #define OBJ_set_brand OBJ_id_set,8L #define SN_setct_PANData "setct-PANData" -#define NID_setct_PANData 583 +#define NID_setct_PANData 519 #define OBJ_setct_PANData OBJ_set_ctype,0L #define SN_setct_PANToken "setct-PANToken" -#define NID_setct_PANToken 584 +#define NID_setct_PANToken 520 #define OBJ_setct_PANToken OBJ_set_ctype,1L #define SN_setct_PANOnly "setct-PANOnly" -#define NID_setct_PANOnly 585 +#define NID_setct_PANOnly 521 #define OBJ_setct_PANOnly OBJ_set_ctype,2L #define SN_setct_OIData "setct-OIData" -#define NID_setct_OIData 586 +#define NID_setct_OIData 522 #define OBJ_setct_OIData OBJ_set_ctype,3L #define SN_setct_PI "setct-PI" -#define NID_setct_PI 587 +#define NID_setct_PI 523 #define OBJ_setct_PI OBJ_set_ctype,4L #define SN_setct_PIData "setct-PIData" -#define NID_setct_PIData 588 +#define NID_setct_PIData 524 #define OBJ_setct_PIData OBJ_set_ctype,5L #define SN_setct_PIDataUnsigned "setct-PIDataUnsigned" -#define NID_setct_PIDataUnsigned 589 +#define NID_setct_PIDataUnsigned 525 #define OBJ_setct_PIDataUnsigned OBJ_set_ctype,6L #define SN_setct_HODInput "setct-HODInput" -#define NID_setct_HODInput 590 +#define NID_setct_HODInput 526 #define OBJ_setct_HODInput OBJ_set_ctype,7L #define SN_setct_AuthResBaggage "setct-AuthResBaggage" -#define NID_setct_AuthResBaggage 591 +#define NID_setct_AuthResBaggage 527 #define OBJ_setct_AuthResBaggage OBJ_set_ctype,8L #define SN_setct_AuthRevReqBaggage "setct-AuthRevReqBaggage" -#define NID_setct_AuthRevReqBaggage 592 +#define NID_setct_AuthRevReqBaggage 528 #define OBJ_setct_AuthRevReqBaggage OBJ_set_ctype,9L #define SN_setct_AuthRevResBaggage "setct-AuthRevResBaggage" -#define NID_setct_AuthRevResBaggage 593 +#define NID_setct_AuthRevResBaggage 529 #define OBJ_setct_AuthRevResBaggage OBJ_set_ctype,10L #define SN_setct_CapTokenSeq "setct-CapTokenSeq" -#define NID_setct_CapTokenSeq 594 +#define NID_setct_CapTokenSeq 530 #define OBJ_setct_CapTokenSeq OBJ_set_ctype,11L #define SN_setct_PInitResData "setct-PInitResData" -#define NID_setct_PInitResData 595 +#define NID_setct_PInitResData 531 #define OBJ_setct_PInitResData OBJ_set_ctype,12L #define SN_setct_PI_TBS "setct-PI-TBS" -#define NID_setct_PI_TBS 596 +#define NID_setct_PI_TBS 532 #define OBJ_setct_PI_TBS OBJ_set_ctype,13L #define SN_setct_PResData "setct-PResData" -#define NID_setct_PResData 597 +#define NID_setct_PResData 533 #define OBJ_setct_PResData OBJ_set_ctype,14L #define SN_setct_AuthReqTBS "setct-AuthReqTBS" -#define NID_setct_AuthReqTBS 598 +#define NID_setct_AuthReqTBS 534 #define OBJ_setct_AuthReqTBS OBJ_set_ctype,16L #define SN_setct_AuthResTBS "setct-AuthResTBS" -#define NID_setct_AuthResTBS 599 +#define NID_setct_AuthResTBS 535 #define OBJ_setct_AuthResTBS OBJ_set_ctype,17L #define SN_setct_AuthResTBSX "setct-AuthResTBSX" -#define NID_setct_AuthResTBSX 600 +#define NID_setct_AuthResTBSX 536 #define OBJ_setct_AuthResTBSX OBJ_set_ctype,18L #define SN_setct_AuthTokenTBS "setct-AuthTokenTBS" -#define NID_setct_AuthTokenTBS 601 +#define NID_setct_AuthTokenTBS 537 #define OBJ_setct_AuthTokenTBS OBJ_set_ctype,19L #define SN_setct_CapTokenData "setct-CapTokenData" -#define NID_setct_CapTokenData 602 +#define NID_setct_CapTokenData 538 #define OBJ_setct_CapTokenData OBJ_set_ctype,20L #define SN_setct_CapTokenTBS "setct-CapTokenTBS" -#define NID_setct_CapTokenTBS 603 +#define NID_setct_CapTokenTBS 539 #define OBJ_setct_CapTokenTBS OBJ_set_ctype,21L #define SN_setct_AcqCardCodeMsg "setct-AcqCardCodeMsg" -#define NID_setct_AcqCardCodeMsg 604 +#define NID_setct_AcqCardCodeMsg 540 #define OBJ_setct_AcqCardCodeMsg OBJ_set_ctype,22L #define SN_setct_AuthRevReqTBS "setct-AuthRevReqTBS" -#define NID_setct_AuthRevReqTBS 605 +#define NID_setct_AuthRevReqTBS 541 #define OBJ_setct_AuthRevReqTBS OBJ_set_ctype,23L #define SN_setct_AuthRevResData "setct-AuthRevResData" -#define NID_setct_AuthRevResData 606 +#define NID_setct_AuthRevResData 542 #define OBJ_setct_AuthRevResData OBJ_set_ctype,24L #define SN_setct_AuthRevResTBS "setct-AuthRevResTBS" -#define NID_setct_AuthRevResTBS 607 +#define NID_setct_AuthRevResTBS 543 #define OBJ_setct_AuthRevResTBS OBJ_set_ctype,25L #define SN_setct_CapReqTBS "setct-CapReqTBS" -#define NID_setct_CapReqTBS 608 +#define NID_setct_CapReqTBS 544 #define OBJ_setct_CapReqTBS OBJ_set_ctype,26L #define SN_setct_CapReqTBSX "setct-CapReqTBSX" -#define NID_setct_CapReqTBSX 609 +#define NID_setct_CapReqTBSX 545 #define OBJ_setct_CapReqTBSX OBJ_set_ctype,27L #define SN_setct_CapResData "setct-CapResData" -#define NID_setct_CapResData 610 +#define NID_setct_CapResData 546 #define OBJ_setct_CapResData OBJ_set_ctype,28L #define SN_setct_CapRevReqTBS "setct-CapRevReqTBS" -#define NID_setct_CapRevReqTBS 611 +#define NID_setct_CapRevReqTBS 547 #define OBJ_setct_CapRevReqTBS OBJ_set_ctype,29L #define SN_setct_CapRevReqTBSX "setct-CapRevReqTBSX" -#define NID_setct_CapRevReqTBSX 612 +#define NID_setct_CapRevReqTBSX 548 #define OBJ_setct_CapRevReqTBSX OBJ_set_ctype,30L #define SN_setct_CapRevResData "setct-CapRevResData" -#define NID_setct_CapRevResData 613 +#define NID_setct_CapRevResData 549 #define OBJ_setct_CapRevResData OBJ_set_ctype,31L #define SN_setct_CredReqTBS "setct-CredReqTBS" -#define NID_setct_CredReqTBS 614 +#define NID_setct_CredReqTBS 550 #define OBJ_setct_CredReqTBS OBJ_set_ctype,32L #define SN_setct_CredReqTBSX "setct-CredReqTBSX" -#define NID_setct_CredReqTBSX 615 +#define NID_setct_CredReqTBSX 551 #define OBJ_setct_CredReqTBSX OBJ_set_ctype,33L #define SN_setct_CredResData "setct-CredResData" -#define NID_setct_CredResData 616 +#define NID_setct_CredResData 552 #define OBJ_setct_CredResData OBJ_set_ctype,34L #define SN_setct_CredRevReqTBS "setct-CredRevReqTBS" -#define NID_setct_CredRevReqTBS 617 +#define NID_setct_CredRevReqTBS 553 #define OBJ_setct_CredRevReqTBS OBJ_set_ctype,35L #define SN_setct_CredRevReqTBSX "setct-CredRevReqTBSX" -#define NID_setct_CredRevReqTBSX 618 +#define NID_setct_CredRevReqTBSX 554 #define OBJ_setct_CredRevReqTBSX OBJ_set_ctype,36L #define SN_setct_CredRevResData "setct-CredRevResData" -#define NID_setct_CredRevResData 619 +#define NID_setct_CredRevResData 555 #define OBJ_setct_CredRevResData OBJ_set_ctype,37L #define SN_setct_PCertReqData "setct-PCertReqData" -#define NID_setct_PCertReqData 620 +#define NID_setct_PCertReqData 556 #define OBJ_setct_PCertReqData OBJ_set_ctype,38L #define SN_setct_PCertResTBS "setct-PCertResTBS" -#define NID_setct_PCertResTBS 621 +#define NID_setct_PCertResTBS 557 #define OBJ_setct_PCertResTBS OBJ_set_ctype,39L #define SN_setct_BatchAdminReqData "setct-BatchAdminReqData" -#define NID_setct_BatchAdminReqData 622 +#define NID_setct_BatchAdminReqData 558 #define OBJ_setct_BatchAdminReqData OBJ_set_ctype,40L #define SN_setct_BatchAdminResData "setct-BatchAdminResData" -#define NID_setct_BatchAdminResData 623 +#define NID_setct_BatchAdminResData 559 #define OBJ_setct_BatchAdminResData OBJ_set_ctype,41L #define SN_setct_CardCInitResTBS "setct-CardCInitResTBS" -#define NID_setct_CardCInitResTBS 624 +#define NID_setct_CardCInitResTBS 560 #define OBJ_setct_CardCInitResTBS OBJ_set_ctype,42L #define SN_setct_MeAqCInitResTBS "setct-MeAqCInitResTBS" -#define NID_setct_MeAqCInitResTBS 625 +#define NID_setct_MeAqCInitResTBS 561 #define OBJ_setct_MeAqCInitResTBS OBJ_set_ctype,43L #define SN_setct_RegFormResTBS "setct-RegFormResTBS" -#define NID_setct_RegFormResTBS 626 +#define NID_setct_RegFormResTBS 562 #define OBJ_setct_RegFormResTBS OBJ_set_ctype,44L #define SN_setct_CertReqData "setct-CertReqData" -#define NID_setct_CertReqData 627 +#define NID_setct_CertReqData 563 #define OBJ_setct_CertReqData OBJ_set_ctype,45L #define SN_setct_CertReqTBS "setct-CertReqTBS" -#define NID_setct_CertReqTBS 628 +#define NID_setct_CertReqTBS 564 #define OBJ_setct_CertReqTBS OBJ_set_ctype,46L #define SN_setct_CertResData "setct-CertResData" -#define NID_setct_CertResData 629 +#define NID_setct_CertResData 565 #define OBJ_setct_CertResData OBJ_set_ctype,47L #define SN_setct_CertInqReqTBS "setct-CertInqReqTBS" -#define NID_setct_CertInqReqTBS 630 +#define NID_setct_CertInqReqTBS 566 #define OBJ_setct_CertInqReqTBS OBJ_set_ctype,48L #define SN_setct_ErrorTBS "setct-ErrorTBS" -#define NID_setct_ErrorTBS 631 +#define NID_setct_ErrorTBS 567 #define OBJ_setct_ErrorTBS OBJ_set_ctype,49L #define SN_setct_PIDualSignedTBE "setct-PIDualSignedTBE" -#define NID_setct_PIDualSignedTBE 632 +#define NID_setct_PIDualSignedTBE 568 #define OBJ_setct_PIDualSignedTBE OBJ_set_ctype,50L #define SN_setct_PIUnsignedTBE "setct-PIUnsignedTBE" -#define NID_setct_PIUnsignedTBE 633 +#define NID_setct_PIUnsignedTBE 569 #define OBJ_setct_PIUnsignedTBE OBJ_set_ctype,51L #define SN_setct_AuthReqTBE "setct-AuthReqTBE" -#define NID_setct_AuthReqTBE 634 +#define NID_setct_AuthReqTBE 570 #define OBJ_setct_AuthReqTBE OBJ_set_ctype,52L #define SN_setct_AuthResTBE "setct-AuthResTBE" -#define NID_setct_AuthResTBE 635 +#define NID_setct_AuthResTBE 571 #define OBJ_setct_AuthResTBE OBJ_set_ctype,53L #define SN_setct_AuthResTBEX "setct-AuthResTBEX" -#define NID_setct_AuthResTBEX 636 +#define NID_setct_AuthResTBEX 572 #define OBJ_setct_AuthResTBEX OBJ_set_ctype,54L #define SN_setct_AuthTokenTBE "setct-AuthTokenTBE" -#define NID_setct_AuthTokenTBE 637 +#define NID_setct_AuthTokenTBE 573 #define OBJ_setct_AuthTokenTBE OBJ_set_ctype,55L #define SN_setct_CapTokenTBE "setct-CapTokenTBE" -#define NID_setct_CapTokenTBE 638 +#define NID_setct_CapTokenTBE 574 #define OBJ_setct_CapTokenTBE OBJ_set_ctype,56L #define SN_setct_CapTokenTBEX "setct-CapTokenTBEX" -#define NID_setct_CapTokenTBEX 639 +#define NID_setct_CapTokenTBEX 575 #define OBJ_setct_CapTokenTBEX OBJ_set_ctype,57L #define SN_setct_AcqCardCodeMsgTBE "setct-AcqCardCodeMsgTBE" -#define NID_setct_AcqCardCodeMsgTBE 640 +#define NID_setct_AcqCardCodeMsgTBE 576 #define OBJ_setct_AcqCardCodeMsgTBE OBJ_set_ctype,58L #define SN_setct_AuthRevReqTBE "setct-AuthRevReqTBE" -#define NID_setct_AuthRevReqTBE 641 +#define NID_setct_AuthRevReqTBE 577 #define OBJ_setct_AuthRevReqTBE OBJ_set_ctype,59L #define SN_setct_AuthRevResTBE "setct-AuthRevResTBE" -#define NID_setct_AuthRevResTBE 642 +#define NID_setct_AuthRevResTBE 578 #define OBJ_setct_AuthRevResTBE OBJ_set_ctype,60L #define SN_setct_AuthRevResTBEB "setct-AuthRevResTBEB" -#define NID_setct_AuthRevResTBEB 643 +#define NID_setct_AuthRevResTBEB 579 #define OBJ_setct_AuthRevResTBEB OBJ_set_ctype,61L #define SN_setct_CapReqTBE "setct-CapReqTBE" -#define NID_setct_CapReqTBE 644 +#define NID_setct_CapReqTBE 580 #define OBJ_setct_CapReqTBE OBJ_set_ctype,62L #define SN_setct_CapReqTBEX "setct-CapReqTBEX" -#define NID_setct_CapReqTBEX 645 +#define NID_setct_CapReqTBEX 581 #define OBJ_setct_CapReqTBEX OBJ_set_ctype,63L #define SN_setct_CapResTBE "setct-CapResTBE" -#define NID_setct_CapResTBE 646 +#define NID_setct_CapResTBE 582 #define OBJ_setct_CapResTBE OBJ_set_ctype,64L #define SN_setct_CapRevReqTBE "setct-CapRevReqTBE" -#define NID_setct_CapRevReqTBE 647 +#define NID_setct_CapRevReqTBE 583 #define OBJ_setct_CapRevReqTBE OBJ_set_ctype,65L #define SN_setct_CapRevReqTBEX "setct-CapRevReqTBEX" -#define NID_setct_CapRevReqTBEX 648 +#define NID_setct_CapRevReqTBEX 584 #define OBJ_setct_CapRevReqTBEX OBJ_set_ctype,66L #define SN_setct_CapRevResTBE "setct-CapRevResTBE" -#define NID_setct_CapRevResTBE 649 +#define NID_setct_CapRevResTBE 585 #define OBJ_setct_CapRevResTBE OBJ_set_ctype,67L #define SN_setct_CredReqTBE "setct-CredReqTBE" -#define NID_setct_CredReqTBE 650 +#define NID_setct_CredReqTBE 586 #define OBJ_setct_CredReqTBE OBJ_set_ctype,68L #define SN_setct_CredReqTBEX "setct-CredReqTBEX" -#define NID_setct_CredReqTBEX 651 +#define NID_setct_CredReqTBEX 587 #define OBJ_setct_CredReqTBEX OBJ_set_ctype,69L #define SN_setct_CredResTBE "setct-CredResTBE" -#define NID_setct_CredResTBE 652 +#define NID_setct_CredResTBE 588 #define OBJ_setct_CredResTBE OBJ_set_ctype,70L #define SN_setct_CredRevReqTBE "setct-CredRevReqTBE" -#define NID_setct_CredRevReqTBE 653 +#define NID_setct_CredRevReqTBE 589 #define OBJ_setct_CredRevReqTBE OBJ_set_ctype,71L #define SN_setct_CredRevReqTBEX "setct-CredRevReqTBEX" -#define NID_setct_CredRevReqTBEX 654 +#define NID_setct_CredRevReqTBEX 590 #define OBJ_setct_CredRevReqTBEX OBJ_set_ctype,72L #define SN_setct_CredRevResTBE "setct-CredRevResTBE" -#define NID_setct_CredRevResTBE 655 +#define NID_setct_CredRevResTBE 591 #define OBJ_setct_CredRevResTBE OBJ_set_ctype,73L #define SN_setct_BatchAdminReqTBE "setct-BatchAdminReqTBE" -#define NID_setct_BatchAdminReqTBE 656 +#define NID_setct_BatchAdminReqTBE 592 #define OBJ_setct_BatchAdminReqTBE OBJ_set_ctype,74L #define SN_setct_BatchAdminResTBE "setct-BatchAdminResTBE" -#define NID_setct_BatchAdminResTBE 657 +#define NID_setct_BatchAdminResTBE 593 #define OBJ_setct_BatchAdminResTBE OBJ_set_ctype,75L #define SN_setct_RegFormReqTBE "setct-RegFormReqTBE" -#define NID_setct_RegFormReqTBE 658 +#define NID_setct_RegFormReqTBE 594 #define OBJ_setct_RegFormReqTBE OBJ_set_ctype,76L #define SN_setct_CertReqTBE "setct-CertReqTBE" -#define NID_setct_CertReqTBE 659 +#define NID_setct_CertReqTBE 595 #define OBJ_setct_CertReqTBE OBJ_set_ctype,77L #define SN_setct_CertReqTBEX "setct-CertReqTBEX" -#define NID_setct_CertReqTBEX 660 +#define NID_setct_CertReqTBEX 596 #define OBJ_setct_CertReqTBEX OBJ_set_ctype,78L #define SN_setct_CertResTBE "setct-CertResTBE" -#define NID_setct_CertResTBE 661 +#define NID_setct_CertResTBE 597 #define OBJ_setct_CertResTBE OBJ_set_ctype,79L #define SN_setct_CRLNotificationTBS "setct-CRLNotificationTBS" -#define NID_setct_CRLNotificationTBS 662 +#define NID_setct_CRLNotificationTBS 598 #define OBJ_setct_CRLNotificationTBS OBJ_set_ctype,80L #define SN_setct_CRLNotificationResTBS "setct-CRLNotificationResTBS" -#define NID_setct_CRLNotificationResTBS 663 +#define NID_setct_CRLNotificationResTBS 599 #define OBJ_setct_CRLNotificationResTBS OBJ_set_ctype,81L #define SN_setct_BCIDistributionTBS "setct-BCIDistributionTBS" -#define NID_setct_BCIDistributionTBS 664 +#define NID_setct_BCIDistributionTBS 600 #define OBJ_setct_BCIDistributionTBS OBJ_set_ctype,82L #define SN_setext_genCrypt "setext-genCrypt" #define LN_setext_genCrypt "generic cryptogram" -#define NID_setext_genCrypt 665 +#define NID_setext_genCrypt 601 #define OBJ_setext_genCrypt OBJ_set_msgExt,1L #define SN_setext_miAuth "setext-miAuth" #define LN_setext_miAuth "merchant initiated auth" -#define NID_setext_miAuth 666 +#define NID_setext_miAuth 602 #define OBJ_setext_miAuth OBJ_set_msgExt,3L #define SN_setext_pinSecure "setext-pinSecure" -#define NID_setext_pinSecure 667 +#define NID_setext_pinSecure 603 #define OBJ_setext_pinSecure OBJ_set_msgExt,4L #define SN_setext_pinAny "setext-pinAny" -#define NID_setext_pinAny 668 +#define NID_setext_pinAny 604 #define OBJ_setext_pinAny OBJ_set_msgExt,5L #define SN_setext_track2 "setext-track2" -#define NID_setext_track2 669 +#define NID_setext_track2 605 #define OBJ_setext_track2 OBJ_set_msgExt,7L #define SN_setext_cv "setext-cv" #define LN_setext_cv "additional verification" -#define NID_setext_cv 670 +#define NID_setext_cv 606 #define OBJ_setext_cv OBJ_set_msgExt,8L #define SN_set_policy_root "set-policy-root" -#define NID_set_policy_root 671 +#define NID_set_policy_root 607 #define OBJ_set_policy_root OBJ_set_policy,0L #define SN_setCext_hashedRoot "setCext-hashedRoot" -#define NID_setCext_hashedRoot 672 +#define NID_setCext_hashedRoot 608 #define OBJ_setCext_hashedRoot OBJ_set_certExt,0L #define SN_setCext_certType "setCext-certType" -#define NID_setCext_certType 673 +#define NID_setCext_certType 609 #define OBJ_setCext_certType OBJ_set_certExt,1L #define SN_setCext_merchData "setCext-merchData" -#define NID_setCext_merchData 674 +#define NID_setCext_merchData 610 #define OBJ_setCext_merchData OBJ_set_certExt,2L #define SN_setCext_cCertRequired "setCext-cCertRequired" -#define NID_setCext_cCertRequired 675 +#define NID_setCext_cCertRequired 611 #define OBJ_setCext_cCertRequired OBJ_set_certExt,3L #define SN_setCext_tunneling "setCext-tunneling" -#define NID_setCext_tunneling 676 +#define NID_setCext_tunneling 612 #define OBJ_setCext_tunneling OBJ_set_certExt,4L #define SN_setCext_setExt "setCext-setExt" -#define NID_setCext_setExt 677 +#define NID_setCext_setExt 613 #define OBJ_setCext_setExt OBJ_set_certExt,5L #define SN_setCext_setQualf "setCext-setQualf" -#define NID_setCext_setQualf 678 +#define NID_setCext_setQualf 614 #define OBJ_setCext_setQualf OBJ_set_certExt,6L #define SN_setCext_PGWYcapabilities "setCext-PGWYcapabilities" -#define NID_setCext_PGWYcapabilities 679 +#define NID_setCext_PGWYcapabilities 615 #define OBJ_setCext_PGWYcapabilities OBJ_set_certExt,7L #define SN_setCext_TokenIdentifier "setCext-TokenIdentifier" -#define NID_setCext_TokenIdentifier 680 +#define NID_setCext_TokenIdentifier 616 #define OBJ_setCext_TokenIdentifier OBJ_set_certExt,8L #define SN_setCext_Track2Data "setCext-Track2Data" -#define NID_setCext_Track2Data 681 +#define NID_setCext_Track2Data 617 #define OBJ_setCext_Track2Data OBJ_set_certExt,9L #define SN_setCext_TokenType "setCext-TokenType" -#define NID_setCext_TokenType 682 +#define NID_setCext_TokenType 618 #define OBJ_setCext_TokenType OBJ_set_certExt,10L #define SN_setCext_IssuerCapabilities "setCext-IssuerCapabilities" -#define NID_setCext_IssuerCapabilities 683 +#define NID_setCext_IssuerCapabilities 619 #define OBJ_setCext_IssuerCapabilities OBJ_set_certExt,11L #define SN_setAttr_Cert "setAttr-Cert" -#define NID_setAttr_Cert 684 +#define NID_setAttr_Cert 620 #define OBJ_setAttr_Cert OBJ_set_attr,0L #define SN_setAttr_PGWYcap "setAttr-PGWYcap" #define LN_setAttr_PGWYcap "payment gateway capabilities" -#define NID_setAttr_PGWYcap 685 +#define NID_setAttr_PGWYcap 621 #define OBJ_setAttr_PGWYcap OBJ_set_attr,1L #define SN_setAttr_TokenType "setAttr-TokenType" -#define NID_setAttr_TokenType 686 +#define NID_setAttr_TokenType 622 #define OBJ_setAttr_TokenType OBJ_set_attr,2L #define SN_setAttr_IssCap "setAttr-IssCap" #define LN_setAttr_IssCap "issuer capabilities" -#define NID_setAttr_IssCap 687 +#define NID_setAttr_IssCap 623 #define OBJ_setAttr_IssCap OBJ_set_attr,3L #define SN_set_rootKeyThumb "set-rootKeyThumb" -#define NID_set_rootKeyThumb 688 +#define NID_set_rootKeyThumb 624 #define OBJ_set_rootKeyThumb OBJ_setAttr_Cert,0L #define SN_set_addPolicy "set-addPolicy" -#define NID_set_addPolicy 689 +#define NID_set_addPolicy 625 #define OBJ_set_addPolicy OBJ_setAttr_Cert,1L #define SN_setAttr_Token_EMV "setAttr-Token-EMV" -#define NID_setAttr_Token_EMV 690 +#define NID_setAttr_Token_EMV 626 #define OBJ_setAttr_Token_EMV OBJ_setAttr_TokenType,1L #define SN_setAttr_Token_B0Prime "setAttr-Token-B0Prime" -#define NID_setAttr_Token_B0Prime 691 +#define NID_setAttr_Token_B0Prime 627 #define OBJ_setAttr_Token_B0Prime OBJ_setAttr_TokenType,2L #define SN_setAttr_IssCap_CVM "setAttr-IssCap-CVM" -#define NID_setAttr_IssCap_CVM 692 +#define NID_setAttr_IssCap_CVM 628 #define OBJ_setAttr_IssCap_CVM OBJ_setAttr_IssCap,3L #define SN_setAttr_IssCap_T2 "setAttr-IssCap-T2" -#define NID_setAttr_IssCap_T2 693 +#define NID_setAttr_IssCap_T2 629 #define OBJ_setAttr_IssCap_T2 OBJ_setAttr_IssCap,4L #define SN_setAttr_IssCap_Sig "setAttr-IssCap-Sig" -#define NID_setAttr_IssCap_Sig 694 +#define NID_setAttr_IssCap_Sig 630 #define OBJ_setAttr_IssCap_Sig OBJ_setAttr_IssCap,5L #define SN_setAttr_GenCryptgrm "setAttr-GenCryptgrm" #define LN_setAttr_GenCryptgrm "generate cryptogram" -#define NID_setAttr_GenCryptgrm 695 +#define NID_setAttr_GenCryptgrm 631 #define OBJ_setAttr_GenCryptgrm OBJ_setAttr_IssCap_CVM,1L #define SN_setAttr_T2Enc "setAttr-T2Enc" #define LN_setAttr_T2Enc "encrypted track 2" -#define NID_setAttr_T2Enc 696 +#define NID_setAttr_T2Enc 632 #define OBJ_setAttr_T2Enc OBJ_setAttr_IssCap_T2,1L #define SN_setAttr_T2cleartxt "setAttr-T2cleartxt" #define LN_setAttr_T2cleartxt "cleartext track 2" -#define NID_setAttr_T2cleartxt 697 +#define NID_setAttr_T2cleartxt 633 #define OBJ_setAttr_T2cleartxt OBJ_setAttr_IssCap_T2,2L #define SN_setAttr_TokICCsig "setAttr-TokICCsig" #define LN_setAttr_TokICCsig "ICC or token signature" -#define NID_setAttr_TokICCsig 698 +#define NID_setAttr_TokICCsig 634 #define OBJ_setAttr_TokICCsig OBJ_setAttr_IssCap_Sig,1L #define SN_setAttr_SecDevSig "setAttr-SecDevSig" #define LN_setAttr_SecDevSig "secure device signature" -#define NID_setAttr_SecDevSig 699 +#define NID_setAttr_SecDevSig 635 #define OBJ_setAttr_SecDevSig OBJ_setAttr_IssCap_Sig,2L #define SN_set_brand_IATA_ATA "set-brand-IATA-ATA" -#define NID_set_brand_IATA_ATA 700 +#define NID_set_brand_IATA_ATA 636 #define OBJ_set_brand_IATA_ATA OBJ_set_brand,1L #define SN_set_brand_Diners "set-brand-Diners" -#define NID_set_brand_Diners 701 +#define NID_set_brand_Diners 637 #define OBJ_set_brand_Diners OBJ_set_brand,30L #define SN_set_brand_AmericanExpress "set-brand-AmericanExpress" -#define NID_set_brand_AmericanExpress 702 +#define NID_set_brand_AmericanExpress 638 #define OBJ_set_brand_AmericanExpress OBJ_set_brand,34L #define SN_set_brand_JCB "set-brand-JCB" -#define NID_set_brand_JCB 703 +#define NID_set_brand_JCB 639 #define OBJ_set_brand_JCB OBJ_set_brand,35L #define SN_set_brand_Visa "set-brand-Visa" -#define NID_set_brand_Visa 704 +#define NID_set_brand_Visa 640 #define OBJ_set_brand_Visa OBJ_set_brand,4L #define SN_set_brand_MasterCard "set-brand-MasterCard" -#define NID_set_brand_MasterCard 705 +#define NID_set_brand_MasterCard 641 #define OBJ_set_brand_MasterCard OBJ_set_brand,5L #define SN_set_brand_Novus "set-brand-Novus" -#define NID_set_brand_Novus 706 +#define NID_set_brand_Novus 642 #define OBJ_set_brand_Novus OBJ_set_brand,6011L #define SN_des_cdmf "DES-CDMF" #define LN_des_cdmf "des-cdmf" -#define NID_des_cdmf 707 +#define NID_des_cdmf 643 #define OBJ_des_cdmf OBJ_rsadsi,3L,10L #define SN_rsaOAEPEncryptionSET "rsaOAEPEncryptionSET" -#define NID_rsaOAEPEncryptionSET 708 +#define NID_rsaOAEPEncryptionSET 644 #define OBJ_rsaOAEPEncryptionSET OBJ_rsadsi,1L,1L,6L #define SN_ipsec3 "Oakley-EC2N-3" #define LN_ipsec3 "ipsec3" -#define NID_ipsec3 724 +#define NID_ipsec3 744 #define SN_ipsec4 "Oakley-EC2N-4" #define LN_ipsec4 "ipsec4" -#define NID_ipsec4 725 +#define NID_ipsec4 745 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 848150255..c5dd8db1d 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -500,245 +500,246 @@ personalSignature 499 dITRedirect 500 audio 501 documentPublisher 502 -X9_62_id_characteristic_two_basis 503 -X9_62_onBasis 504 -X9_62_tpBasis 505 -X9_62_ppBasis 506 -X9_62_c2pnb163v1 507 -X9_62_c2pnb163v2 508 -X9_62_c2pnb163v3 509 -X9_62_c2pnb176v1 510 -X9_62_c2tnb191v1 511 -X9_62_c2tnb191v2 512 -X9_62_c2tnb191v3 513 -X9_62_c2onb191v4 514 -X9_62_c2onb191v5 515 -X9_62_c2pnb208w1 516 -X9_62_c2tnb239v1 517 -X9_62_c2tnb239v2 518 -X9_62_c2tnb239v3 519 -X9_62_c2onb239v4 520 -X9_62_c2onb239v5 521 -X9_62_c2pnb272w1 522 -X9_62_c2pnb304w1 523 -X9_62_c2tnb359v1 524 -X9_62_c2pnb368w1 525 -X9_62_c2tnb431r1 526 -identified_organization 527 -certicom_arc 528 -secp112r1 529 -secp112r2 530 -secp128r1 531 -secp128r2 532 -secp160k1 533 -secp160r1 534 -secp160r2 535 -secp192k1 536 -secp192r1 537 -secp224k1 538 -secp224r1 539 -secp256k1 540 -secp256r1 541 -secp384r1 542 -secp521r1 543 -sect113r1 544 -sect113r2 545 -sect131r1 546 -sect131r2 547 -sect163k1 548 -sect163r1 549 -sect163r2 550 -sect193r1 551 -sect193r2 552 -sect233k1 553 -sect233r1 554 -sect239k1 555 -sect283k1 556 -sect283r1 557 -sect409k1 558 -sect409r1 559 -sect571k1 560 -sect571r1 561 -wap 562 -wap_wsg 563 -wap_wsg_idm_ecid_wtls1 564 -wap_wsg_idm_ecid_wtls6 565 -wap_wsg_idm_ecid_wtls8 566 -wap_wsg_idm_ecid_wtls9 567 -x500UniqueIdentifier 568 -mime_mhs 569 -mime_mhs_headings 570 -mime_mhs_bodies 571 -id_hex_partial_message 572 -id_hex_multipart_message 573 -generationQualifier 574 -pseudonym 575 -id_set 576 -set_ctype 577 -set_msgExt 578 -set_attr 579 -set_policy 580 -set_certExt 581 -set_brand 582 -setct_PANData 583 -setct_PANToken 584 -setct_PANOnly 585 -setct_OIData 586 -setct_PI 587 -setct_PIData 588 -setct_PIDataUnsigned 589 -setct_HODInput 590 -setct_AuthResBaggage 591 -setct_AuthRevReqBaggage 592 -setct_AuthRevResBaggage 593 -setct_CapTokenSeq 594 -setct_PInitResData 595 -setct_PI_TBS 596 -setct_PResData 597 -setct_AuthReqTBS 598 -setct_AuthResTBS 599 -setct_AuthResTBSX 600 -setct_AuthTokenTBS 601 -setct_CapTokenData 602 -setct_CapTokenTBS 603 -setct_AcqCardCodeMsg 604 -setct_AuthRevReqTBS 605 -setct_AuthRevResData 606 -setct_AuthRevResTBS 607 -setct_CapReqTBS 608 -setct_CapReqTBSX 609 -setct_CapResData 610 -setct_CapRevReqTBS 611 -setct_CapRevReqTBSX 612 -setct_CapRevResData 613 -setct_CredReqTBS 614 -setct_CredReqTBSX 615 -setct_CredResData 616 -setct_CredRevReqTBS 617 -setct_CredRevReqTBSX 618 -setct_CredRevResData 619 -setct_PCertReqData 620 -setct_PCertResTBS 621 -setct_BatchAdminReqData 622 -setct_BatchAdminResData 623 -setct_CardCInitResTBS 624 -setct_MeAqCInitResTBS 625 -setct_RegFormResTBS 626 -setct_CertReqData 627 -setct_CertReqTBS 628 -setct_CertResData 629 -setct_CertInqReqTBS 630 -setct_ErrorTBS 631 -setct_PIDualSignedTBE 632 -setct_PIUnsignedTBE 633 -setct_AuthReqTBE 634 -setct_AuthResTBE 635 -setct_AuthResTBEX 636 -setct_AuthTokenTBE 637 -setct_CapTokenTBE 638 -setct_CapTokenTBEX 639 -setct_AcqCardCodeMsgTBE 640 -setct_AuthRevReqTBE 641 -setct_AuthRevResTBE 642 -setct_AuthRevResTBEB 643 -setct_CapReqTBE 644 -setct_CapReqTBEX 645 -setct_CapResTBE 646 -setct_CapRevReqTBE 647 -setct_CapRevReqTBEX 648 -setct_CapRevResTBE 649 -setct_CredReqTBE 650 -setct_CredReqTBEX 651 -setct_CredResTBE 652 -setct_CredRevReqTBE 653 -setct_CredRevReqTBEX 654 -setct_CredRevResTBE 655 -setct_BatchAdminReqTBE 656 -setct_BatchAdminResTBE 657 -setct_RegFormReqTBE 658 -setct_CertReqTBE 659 -setct_CertReqTBEX 660 -setct_CertResTBE 661 -setct_CRLNotificationTBS 662 -setct_CRLNotificationResTBS 663 -setct_BCIDistributionTBS 664 -setext_genCrypt 665 -setext_miAuth 666 -setext_pinSecure 667 -setext_pinAny 668 -setext_track2 669 -setext_cv 670 -set_policy_root 671 -setCext_hashedRoot 672 -setCext_certType 673 -setCext_merchData 674 -setCext_cCertRequired 675 -setCext_tunneling 676 -setCext_setExt 677 -setCext_setQualf 678 -setCext_PGWYcapabilities 679 -setCext_TokenIdentifier 680 -setCext_Track2Data 681 -setCext_TokenType 682 -setCext_IssuerCapabilities 683 -setAttr_Cert 684 -setAttr_PGWYcap 685 -setAttr_TokenType 686 -setAttr_IssCap 687 -set_rootKeyThumb 688 -set_addPolicy 689 -setAttr_Token_EMV 690 -setAttr_Token_B0Prime 691 -setAttr_IssCap_CVM 692 -setAttr_IssCap_T2 693 -setAttr_IssCap_Sig 694 -setAttr_GenCryptgrm 695 -setAttr_T2Enc 696 -setAttr_T2cleartxt 697 -setAttr_TokICCsig 698 -setAttr_SecDevSig 699 -set_brand_IATA_ATA 700 -set_brand_Diners 701 -set_brand_AmericanExpress 702 -set_brand_JCB 703 -set_brand_Visa 704 -set_brand_MasterCard 705 -set_brand_Novus 706 -des_cdmf 707 -rsaOAEPEncryptionSET 708 -wap_wsg_idm_ecid_wtls3 709 -wap_wsg_idm_ecid_wtls4 710 -wap_wsg_idm_ecid_wtls5 711 -wap_wsg_idm_ecid_wtls7 712 -wap_wsg_idm_ecid_wtls10 713 -wap_wsg_idm_ecid_wtls11 714 -wap_wsg_idm_ecid_wtls12 715 -ms_smartcard_login 716 -ms_upn 717 -any_policy 718 -policy_mappings 719 -name_constraints 720 -itu_t 721 -joint_iso_itu_t 722 -international_organizations 723 -ipsec3 724 -ipsec4 725 -aes_128_cfb1 726 -aes_192_cfb1 727 -aes_256_cfb1 728 -aes_128_cfb8 729 -aes_192_cfb8 730 -aes_256_cfb8 731 -des_cfb1 732 -des_cfb8 733 -des_ede3_cfb1 734 -des_ede3_cfb8 735 -inhibit_any_policy 736 -sha256WithRSAEncryption 737 -sha384WithRSAEncryption 738 -sha512WithRSAEncryption 739 -sha224WithRSAEncryption 740 -sha256 741 -sha384 742 -sha512 743 -sha224 744 +x500UniqueIdentifier 503 +mime_mhs 504 +mime_mhs_headings 505 +mime_mhs_bodies 506 +id_hex_partial_message 507 +id_hex_multipart_message 508 +generationQualifier 509 +pseudonym 510 +InternationalRA 511 +id_set 512 +set_ctype 513 +set_msgExt 514 +set_attr 515 +set_policy 516 +set_certExt 517 +set_brand 518 +setct_PANData 519 +setct_PANToken 520 +setct_PANOnly 521 +setct_OIData 522 +setct_PI 523 +setct_PIData 524 +setct_PIDataUnsigned 525 +setct_HODInput 526 +setct_AuthResBaggage 527 +setct_AuthRevReqBaggage 528 +setct_AuthRevResBaggage 529 +setct_CapTokenSeq 530 +setct_PInitResData 531 +setct_PI_TBS 532 +setct_PResData 533 +setct_AuthReqTBS 534 +setct_AuthResTBS 535 +setct_AuthResTBSX 536 +setct_AuthTokenTBS 537 +setct_CapTokenData 538 +setct_CapTokenTBS 539 +setct_AcqCardCodeMsg 540 +setct_AuthRevReqTBS 541 +setct_AuthRevResData 542 +setct_AuthRevResTBS 543 +setct_CapReqTBS 544 +setct_CapReqTBSX 545 +setct_CapResData 546 +setct_CapRevReqTBS 547 +setct_CapRevReqTBSX 548 +setct_CapRevResData 549 +setct_CredReqTBS 550 +setct_CredReqTBSX 551 +setct_CredResData 552 +setct_CredRevReqTBS 553 +setct_CredRevReqTBSX 554 +setct_CredRevResData 555 +setct_PCertReqData 556 +setct_PCertResTBS 557 +setct_BatchAdminReqData 558 +setct_BatchAdminResData 559 +setct_CardCInitResTBS 560 +setct_MeAqCInitResTBS 561 +setct_RegFormResTBS 562 +setct_CertReqData 563 +setct_CertReqTBS 564 +setct_CertResData 565 +setct_CertInqReqTBS 566 +setct_ErrorTBS 567 +setct_PIDualSignedTBE 568 +setct_PIUnsignedTBE 569 +setct_AuthReqTBE 570 +setct_AuthResTBE 571 +setct_AuthResTBEX 572 +setct_AuthTokenTBE 573 +setct_CapTokenTBE 574 +setct_CapTokenTBEX 575 +setct_AcqCardCodeMsgTBE 576 +setct_AuthRevReqTBE 577 +setct_AuthRevResTBE 578 +setct_AuthRevResTBEB 579 +setct_CapReqTBE 580 +setct_CapReqTBEX 581 +setct_CapResTBE 582 +setct_CapRevReqTBE 583 +setct_CapRevReqTBEX 584 +setct_CapRevResTBE 585 +setct_CredReqTBE 586 +setct_CredReqTBEX 587 +setct_CredResTBE 588 +setct_CredRevReqTBE 589 +setct_CredRevReqTBEX 590 +setct_CredRevResTBE 591 +setct_BatchAdminReqTBE 592 +setct_BatchAdminResTBE 593 +setct_RegFormReqTBE 594 +setct_CertReqTBE 595 +setct_CertReqTBEX 596 +setct_CertResTBE 597 +setct_CRLNotificationTBS 598 +setct_CRLNotificationResTBS 599 +setct_BCIDistributionTBS 600 +setext_genCrypt 601 +setext_miAuth 602 +setext_pinSecure 603 +setext_pinAny 604 +setext_track2 605 +setext_cv 606 +set_policy_root 607 +setCext_hashedRoot 608 +setCext_certType 609 +setCext_merchData 610 +setCext_cCertRequired 611 +setCext_tunneling 612 +setCext_setExt 613 +setCext_setQualf 614 +setCext_PGWYcapabilities 615 +setCext_TokenIdentifier 616 +setCext_Track2Data 617 +setCext_TokenType 618 +setCext_IssuerCapabilities 619 +setAttr_Cert 620 +setAttr_PGWYcap 621 +setAttr_TokenType 622 +setAttr_IssCap 623 +set_rootKeyThumb 624 +set_addPolicy 625 +setAttr_Token_EMV 626 +setAttr_Token_B0Prime 627 +setAttr_IssCap_CVM 628 +setAttr_IssCap_T2 629 +setAttr_IssCap_Sig 630 +setAttr_GenCryptgrm 631 +setAttr_T2Enc 632 +setAttr_T2cleartxt 633 +setAttr_TokICCsig 634 +setAttr_SecDevSig 635 +set_brand_IATA_ATA 636 +set_brand_Diners 637 +set_brand_AmericanExpress 638 +set_brand_JCB 639 +set_brand_Visa 640 +set_brand_MasterCard 641 +set_brand_Novus 642 +des_cdmf 643 +rsaOAEPEncryptionSET 644 +itu_t 645 +joint_iso_itu_t 646 +international_organizations 647 +ms_smartcard_login 648 +ms_upn 649 +aes_128_cfb1 650 +aes_192_cfb1 651 +aes_256_cfb1 652 +aes_128_cfb8 653 +aes_192_cfb8 654 +aes_256_cfb8 655 +des_cfb1 656 +des_cfb8 657 +des_ede3_cfb1 658 +des_ede3_cfb8 659 +streetAddress 660 +postalCode 661 +identified_organization 662 +certicom_arc 663 +wap 664 +wap_wsg 665 +X9_62_id_characteristic_two_basis 666 +X9_62_onBasis 667 +X9_62_tpBasis 668 +X9_62_ppBasis 669 +X9_62_c2pnb163v1 670 +X9_62_c2pnb163v2 671 +X9_62_c2pnb163v3 672 +X9_62_c2pnb176v1 673 +X9_62_c2tnb191v1 674 +X9_62_c2tnb191v2 675 +X9_62_c2tnb191v3 676 +X9_62_c2onb191v4 677 +X9_62_c2onb191v5 678 +X9_62_c2pnb208w1 679 +X9_62_c2tnb239v1 680 +X9_62_c2tnb239v2 681 +X9_62_c2tnb239v3 682 +X9_62_c2onb239v4 683 +X9_62_c2onb239v5 684 +X9_62_c2pnb272w1 685 +X9_62_c2pnb304w1 686 +X9_62_c2tnb359v1 687 +X9_62_c2pnb368w1 688 +X9_62_c2tnb431r1 689 +secp112r1 690 +secp112r2 691 +secp128r1 692 +secp128r2 693 +secp160k1 694 +secp160r1 695 +secp160r2 696 +secp192k1 697 +secp224k1 698 +secp224r1 699 +secp256k1 700 +secp384r1 701 +secp521r1 702 +sect113r1 703 +sect113r2 704 +sect131r1 705 +sect131r2 706 +sect163k1 707 +sect163r1 708 +sect163r2 709 +sect193r1 710 +sect193r2 711 +sect233k1 712 +sect233r1 713 +sect239k1 714 +sect283k1 715 +sect283r1 716 +sect409k1 717 +sect409r1 718 +sect571k1 719 +sect571r1 720 +wap_wsg_idm_ecid_wtls1 721 +wap_wsg_idm_ecid_wtls3 722 +wap_wsg_idm_ecid_wtls4 723 +wap_wsg_idm_ecid_wtls5 724 +wap_wsg_idm_ecid_wtls6 725 +wap_wsg_idm_ecid_wtls7 726 +wap_wsg_idm_ecid_wtls8 727 +wap_wsg_idm_ecid_wtls9 728 +wap_wsg_idm_ecid_wtls10 729 +wap_wsg_idm_ecid_wtls11 730 +wap_wsg_idm_ecid_wtls12 731 +sha256WithRSAEncryption 732 +sha384WithRSAEncryption 733 +sha512WithRSAEncryption 734 +sha224WithRSAEncryption 735 +name_constraints 736 +any_policy 737 +policy_mappings 738 +inhibit_any_policy 739 +sha256 740 +sha384 741 +sha512 742 +sha224 743 +ipsec3 744 +ipsec4 745 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 613be3688..f2ea4a4db 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -629,10 +629,12 @@ X509 5 : : serialNumber X509 6 : C : countryName X509 7 : L : localityName X509 8 : ST : stateOrProvinceName +X509 9 : : streetAddress X509 10 : O : organizationName X509 11 : OU : organizationalUnitName X509 12 : : title X509 13 : : description +X509 17 : : postalCode X509 41 : name : name X509 42 : GN : givenName X509 43 : : initials From f774accdbfa6b793b6e2a5e39a0c98ff5a87277c Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 2 Dec 2004 10:07:55 +0000 Subject: [PATCH 04/12] Fix rc4-ia64.S to pass more exhaustive regression tests. --- crypto/rc4/asm/rc4-ia64.S | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/crypto/rc4/asm/rc4-ia64.S b/crypto/rc4/asm/rc4-ia64.S index ae84af672..b517d2e88 100644 --- a/crypto/rc4/asm/rc4-ia64.S +++ b/crypto/rc4/asm/rc4-ia64.S @@ -7,7 +7,7 @@ // disclaimed. // ==================================================================== -.ident "rc4-ia64.S, Version 1.0" +.ident "rc4-ia64.S, Version 1.1" .ident "IA-64 ISA artwork by Andy Polyakov " // What's wrong with compiler generated code? Because of the nature of @@ -15,11 +15,19 @@ // being memory-bound, RC4 should benefit from reorder [on in-order- // execution core such as IA-64]. But what can we reorder? At the very // least we can safely reorder references to key schedule in respect -// to input and output streams. Secondly, less obvious, it's possible -// to pull up some references to elements of the key schedule itself. -// Fact is that such prior loads are not safe only for "degenerated" -// key schedule, when some elements equal to the same value, which is -// never the case [key schedule setup routine makes sure it's not]. +// to input and output streams. Secondly, from the first [close] glance +// it appeared that it's possible to pull up some references to +// elements of the key schedule itself. Original rationale ["prior +// loads are not safe only for "degenerated" key schedule, when some +// elements equal to the same value"] was kind of sloppy. I should have +// formulated as it really was: if we assume that pulling up reference +// to key[x+1] is not safe, then it would mean that key schedule would +// "degenerate," which is never the case. The problem is that this +// holds true in respect to references to key[x], but not to key[y]. +// Legitimate "collisions" do occur within every 256^2 bytes window. +// Fortunately there're enough free instruction slots to keep prior +// reference to key[x+1], detect "collision" and compensate for it. +// All this without sacrificing a single clock cycle:-) // Furthermore. In order to compress loop body to the minimum, I chose // to deploy deposit instruction, which substitutes for the whole // key->data+((x&255)<data[0]))). This unfortunately @@ -97,7 +105,8 @@ RC4: // deposit instruction only, // I don't have to &~255... mov ar.lc=in1 } -{ .mmi; nop.m 0 +{ .mmi; mov key_y[1]=r0 // guarantee inequality + // in first iteration add xx=1,xx mov pr.rot=1<<16 };; { .mii; nop.m 0 @@ -111,23 +120,23 @@ RC4: // divided by 3 bytes per seconds, or 500MBps on 1.5GHz CPU. Measured // performance however is distinctly lower than 1/4:-( The culplrit // seems to be *(out++)=dat, which inadvertently splits the bundle, -// even though there is M-unit available... Unrolling is due... +// even though there is M-port available... Unrolling is due... // Unrolled loop should collect output with variable shift instruction -// in order to avoid starvation for integer shifter... Only output -// pointer has to be aligned... It should be possible to get pretty -// close to theoretical peak... +// in order to avoid starvation for integer shifter... It should be +// possible to get pretty close to theoretical peak... { .mmi; (p16) LDKEY tx[0]=[key_x[1]] // tx=key[xx] (p17) LDKEY ty[0]=[key_y[1]] // ty=key[yy] (p18) dep rnd[1]=rnd[1],ksch,OFF,8} // &key[(tx+ty)&255] { .mmi; (p19) st1 [out]=dat[3],1 // *(out++)=dat (p16) add xx=1,xx // x++ - (p0) nop.i 0 };; + (p16) cmp.ne.unc p20,p21=key_x[1],key_y[1] };; { .mmi; (p18) LDKEY rnd[1]=[rnd[1]] // rnd=key[(tx+ty)&255] (p16) ld1 dat[0]=[inp],1 // dat=*(inp++) (p16) dep key_x[0]=xx,ksch,OFF,8 } // &key[xx&255] -{ .mmi; (p0) nop.m 0 - (p16) add yy=yy,tx[0] // y+=tx - (p0) nop.i 0 };; +.pred.rel "mutex",p20,p21 +{ .mmi; (p21) add yy=yy,tx[1] // (p16) + (p20) add yy=yy,tx[0] // (p16) y+=tx + (p21) mov tx[0]=tx[1] };; // (p16) { .mmi; (p17) STKEY [key_y[1]]=tx[1] // key[yy]=tx (p17) STKEY [key_x[2]]=ty[0] // key[xx]=ty (p16) dep key_y[0]=yy,ksch,OFF,8 } // &key[yy&255] From 8f284faaec659cdac2cd09d1471d34e3fa5889df Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 3 Dec 2004 00:10:34 +0000 Subject: [PATCH 05/12] V1 certificates that aren't self signed can't be accepted as CAs. --- crypto/x509v3/v3_purp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c index 8d0ebbeae..a60d41bc2 100644 --- a/crypto/x509v3/v3_purp.c +++ b/crypto/x509v3/v3_purp.c @@ -441,8 +441,6 @@ static int check_ca(const X509 *x) /* Older certificates could have Netscape-specific CA types */ else if (x->ex_flags & EXFLAG_NSCERT && x->ex_nscert & NS_ANY_CA) return 5; - /* 2 means "I don't know...", which is legal for V1 and V2 */ - else if (x->ex_flags & EXFLAG_V1) return 2; /* can this still be regarded a CA certificate? I doubt it */ return 0; } From 5b40d7dd9784fe2914095717a591fd59a3f9d7e5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 3 Dec 2004 12:26:56 +0000 Subject: [PATCH 06/12] Add -passin argument to dgst command. --- CHANGES | 3 +++ apps/dgst.c | 17 ++++++++++++++++- doc/apps/dgst.pod | 6 ++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 9617f5212..18b5c23a3 100644 --- a/CHANGES +++ b/CHANGES @@ -745,6 +745,9 @@ Changes between 0.9.7e and 0.9.7f [XX xxx XXXX] + *) Add new -passin argument to dgst. + [Steve Henson] + *) Perform some character comparisons of different types in X509_NAME_cmp: this is needed for some certificates that reencode DNs into UTF8Strings (in violation of RFC3280) and can't or wont issue name rollover diff --git a/apps/dgst.c b/apps/dgst.c index 302531491..c13535f3b 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -100,6 +100,7 @@ int MAIN(int argc, char **argv) EVP_PKEY *sigkey = NULL; unsigned char *sigbuf = NULL; int siglen = 0; + char *passargin = NULL, *passin = NULL; #ifndef OPENSSL_NO_ENGINE char *engine=NULL; #endif @@ -145,6 +146,12 @@ int MAIN(int argc, char **argv) if (--argc < 1) break; keyfile=*(++argv); } + else if (!strcmp(*argv,"-passin")) + { + if (--argc < 1) + break; + passargin=*++argv; + } else if (strcmp(*argv,"-verify") == 0) { if (--argc < 1) break; @@ -257,6 +264,12 @@ int MAIN(int argc, char **argv) BIO_set_callback_arg(in,bio_err); } + if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) + { + BIO_printf(bio_err, "Error getting password\n"); + goto end; + } + if ((in == NULL) || (bmd == NULL)) { ERR_print_errors(bio_err); @@ -298,7 +311,7 @@ int MAIN(int argc, char **argv) sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL, e, "key file"); else - sigkey = load_key(bio_err, keyfile, keyform, 0, NULL, + sigkey = load_key(bio_err, keyfile, keyform, 0, passin, e, "key file"); if (!sigkey) { @@ -385,6 +398,8 @@ end: OPENSSL_free(buf); } if (in != NULL) BIO_free(in); + if (passin) + OPENSSL_free(passin); BIO_free_all(out); EVP_PKEY_free(sigkey); if(sigbuf) OPENSSL_free(sigbuf); diff --git a/doc/apps/dgst.pod b/doc/apps/dgst.pod index 1648742bc..b0d198724 100644 --- a/doc/apps/dgst.pod +++ b/doc/apps/dgst.pod @@ -14,6 +14,7 @@ B B [B<-binary>] [B<-out filename>] [B<-sign filename>] +[B<-passin arg>] [B<-verify filename>] [B<-prverify filename>] [B<-signature filename>] @@ -59,6 +60,11 @@ filename to output to, or standard output by default. digitally sign the digest using the private key in "filename". +=item B<-passin arg> + +the private key password source. For more information about the format of B +see the B section in L. + =item B<-verify filename> verify the signature using the the public key in "filename". From 3e66ee9f01056da4c5efd997e369768762089455 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 4 Dec 2004 21:25:51 +0000 Subject: [PATCH 07/12] In by_file.c check last error for no start line, not first error. --- crypto/x509/by_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index b4b04183d..a5e0d4aef 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -150,7 +150,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) x=PEM_read_bio_X509_AUX(in,NULL,NULL,NULL); if (x == NULL) { - if ((ERR_GET_REASON(ERR_peek_error()) == + if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) { ERR_clear_error(); @@ -217,7 +217,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type) x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL); if (x == NULL) { - if ((ERR_GET_REASON(ERR_peek_error()) == + if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) { ERR_clear_error(); From a8e00b17ce840c58787e45411fa2ac4d6b1fb10c Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 5 Dec 2004 00:51:41 +0000 Subject: [PATCH 08/12] Update year. --- util/mkerr.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/mkerr.pl b/util/mkerr.pl index 1b2915c76..bd4f85945 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -262,7 +262,7 @@ foreach $lib (keys %csrc) } else { push @out, "/* ====================================================================\n", -" * Copyright (c) 2001-2003 The OpenSSL Project. All rights reserved.\n", +" * Copyright (c) 2001-2004 The OpenSSL Project. All rights reserved.\n", " *\n", " * Redistribution and use in source and binary forms, with or without\n", " * modification, are permitted provided that the following conditions\n", From a0e7c8eede26b29b09057f48b8e51f46f8811ddd Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 5 Dec 2004 01:03:15 +0000 Subject: [PATCH 09/12] Add lots of checks for memory allocation failure, error codes to indicate failure and freeing up memory if a failure occurs. PR:620 --- CHANGES | 4 ++ crypto/asn1/a_bitstr.c | 7 ++- crypto/asn1/a_digest.c | 7 ++- crypto/asn1/a_enum.c | 2 +- crypto/asn1/a_gentm.c | 12 +++- crypto/asn1/a_set.c | 23 ++++++-- crypto/asn1/a_utctm.c | 12 +++- crypto/asn1/asn1.h | 6 ++ crypto/asn1/asn1_err.c | 8 ++- crypto/asn1/asn1_lib.c | 1 + crypto/asn1/evp_asn1.c | 6 +- crypto/asn1/p5_pbe.c | 26 +++++--- crypto/asn1/t_bitst.c | 5 +- crypto/asn1/x_pubkey.c | 51 ++++++++++++---- crypto/bn/bn_mont.c | 2 +- crypto/evp/evp_pkey.c | 124 ++++++++++++++++++++++++++++----------- crypto/objects/o_names.c | 7 ++- crypto/objects/obj_dat.c | 12 ++-- crypto/objects/obj_err.c | 4 +- crypto/objects/objects.h | 2 + crypto/pem/pem_lib.c | 2 +- crypto/pkcs12/p12_init.c | 12 ++-- crypto/pkcs12/p12_kiss.c | 18 +++++- crypto/pkcs12/p12_mutl.c | 5 +- crypto/pkcs7/pk7_doit.c | 42 +++++++++++-- crypto/pkcs7/pk7_lib.c | 48 ++++++++++----- crypto/rsa/rsa_saos.c | 7 ++- crypto/rsa/rsa_sign.c | 9 ++- crypto/x509/x509_r2x.c | 6 +- crypto/x509/x509_vfy.c | 3 +- crypto/x509v3/v3_bitst.c | 7 ++- crypto/x509v3/v3_ia5.c | 5 +- crypto/x509v3/v3err.c | 3 +- crypto/x509v3/x509v3.h | 1 + 34 files changed, 368 insertions(+), 121 deletions(-) diff --git a/CHANGES b/CHANGES index 18b5c23a3..78b002083 100644 --- a/CHANGES +++ b/CHANGES @@ -745,6 +745,10 @@ Changes between 0.9.7e and 0.9.7f [XX xxx XXXX] + *) Add lots of checks for memory allocation failure, error codes to indicate + failure and freeing up memory if a failure occurs. + [Nauticus Networks SSL Team , Steve Henson] + *) Add new -passin argument to dgst. [Steve Henson] diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index c1d3c2821..931cc5969 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -195,7 +195,12 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value) c=(unsigned char *)OPENSSL_realloc_clean(a->data, a->length, w+1); - if (c == NULL) return(0); + if (c == NULL) + { + ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT,ERR_R_MALLOC_FAILURE); + return 0; + } + if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length); if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length); a->data=c; a->length=w+1; diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 4931e222a..7182e9fa5 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -65,6 +65,7 @@ # include #endif +#include #include #include #include @@ -78,7 +79,11 @@ int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data, unsigned char *str,*p; i=i2d(data,NULL); - if ((str=(unsigned char *)OPENSSL_malloc(i)) == NULL) return(0); + if ((str=(unsigned char *)OPENSSL_malloc(i)) == NULL) + { + ASN1err(ASN1_F_ASN1_DIGEST,ERR_R_MALLOC_FAILURE); + return(0); + } p=str; i2d(data,&p); diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index 49f9e994b..af9fb9b39 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -158,7 +158,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) unsigned char *new_data=OPENSSL_realloc(ret->data, len+4); if (!new_data) { - ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_MALLOC_FAILURE); + ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE); goto err; } ret->data=new_data; diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index ea8d7b96c..def79062a 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -192,8 +192,9 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str) { if (s != NULL) { - ASN1_STRING_set((ASN1_STRING *)s, - (unsigned char *)str,t.length); + if (!ASN1_STRING_set((ASN1_STRING *)s, + (unsigned char *)str,t.length)) + return 0; s->type=V_ASN1_GENERALIZEDTIME; } return(1); @@ -223,7 +224,12 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s, if ((p == NULL) || ((size_t)s->length < len)) { p=OPENSSL_malloc(len); - if (p == NULL) return(NULL); + if (p == NULL) + { + ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_SET, + ERR_R_MALLOC_FAILURE); + return(NULL); + } if (s->data != NULL) OPENSSL_free(s->data); s->data=(unsigned char *)p; diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c index f37408a31..3c8d3d562 100644 --- a/crypto/asn1/a_set.c +++ b/crypto/asn1/a_set.c @@ -118,8 +118,13 @@ int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(), int ex_tag, } pStart = p; /* Catch the beg of Setblobs*/ - if (!(rgSetBlob = (MYBLOB *)OPENSSL_malloc( sk_num(a) * sizeof(MYBLOB)))) return 0; /* In this array -we will store the SET blobs */ + /* In this array we will store the SET blobs */ + rgSetBlob = (MYBLOB *)OPENSSL_malloc(sk_num(a) * sizeof(MYBLOB)); + if (rgSetBlob == NULL) + { + ASN1err(ASN1_F_I2D_ASN1_SET,ERR_R_MALLOC_FAILURE); + return(0); + } for (i=0; itype = V_ASN1_UTCTIME; } return(1); @@ -203,7 +204,12 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t) if ((p == NULL) || ((size_t)s->length < len)) { p=OPENSSL_malloc(len); - if (p == NULL) return(NULL); + if (p == NULL) + { + ASN1err(ASN1_F_ASN1_UTCTIME_SET,ERR_R_MALLOC_FAILURE); + return(NULL); + } + if (s->data != NULL) if (s->data != NULL) OPENSSL_free(s->data); s->data=(unsigned char *)p; diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 0df0f4762..aad3dcb23 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -993,6 +993,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_F_A2I_ASN1_INTEGER 102 #define ASN1_F_A2I_ASN1_STRING 103 #define ASN1_F_APPEND_TAG 176 +#define ASN1_F_ASN1_BIT_STRING_SET_BIT 183 #define ASN1_F_ASN1_CB 177 #define ASN1_F_ASN1_CHECK_TLEN 104 #define ASN1_F_ASN1_COLLATE_PRIMITIVE 105 @@ -1000,10 +1001,12 @@ void ERR_load_ASN1_strings(void); #define ASN1_F_ASN1_D2I_BIO 107 #define ASN1_F_ASN1_D2I_EX_PRIMITIVE 108 #define ASN1_F_ASN1_D2I_FP 109 +#define ASN1_F_ASN1_DIGEST 184 #define ASN1_F_ASN1_DO_ADB 110 #define ASN1_F_ASN1_DUP 111 #define ASN1_F_ASN1_ENUMERATED_SET 112 #define ASN1_F_ASN1_ENUMERATED_TO_BN 113 +#define ASN1_F_ASN1_GENERALIZEDTIME_SET 185 #define ASN1_F_ASN1_GENERATE_V3 178 #define ASN1_F_ASN1_GET_OBJECT 114 #define ASN1_F_ASN1_HEADER_NEW 115 @@ -1021,6 +1024,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_F_ASN1_SEQ_UNPACK 127 #define ASN1_F_ASN1_SIGN 128 #define ASN1_F_ASN1_STR2TYPE 179 +#define ASN1_F_ASN1_STRING_SET 186 #define ASN1_F_ASN1_STRING_TABLE_ADD 129 #define ASN1_F_ASN1_STRING_TYPE_NEW 130 #define ASN1_F_ASN1_TEMPLATE_D2I 131 @@ -1030,6 +1034,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING 134 #define ASN1_F_ASN1_TYPE_GET_OCTETSTRING 135 #define ASN1_F_ASN1_UNPACK_STRING 136 +#define ASN1_F_ASN1_UTCTIME_SET 187 #define ASN1_F_ASN1_VERIFY 137 #define ASN1_F_BITSTR_CB 180 #define ASN1_F_BN_TO_ASN1_ENUMERATED 138 @@ -1054,6 +1059,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_F_D2I_X509_CINF 157 #define ASN1_F_D2I_X509_NAME 158 #define ASN1_F_D2I_X509_PKEY 159 +#define ASN1_F_I2D_ASN1_SET 188 #define ASN1_F_I2D_ASN1_TIME 160 #define ASN1_F_I2D_DSA_PUBKEY 161 #define ASN1_F_I2D_EC_PUBKEY 181 diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c index d83ed65cd..daffbf214 100644 --- a/crypto/asn1/asn1_err.c +++ b/crypto/asn1/asn1_err.c @@ -1,6 +1,6 @@ /* crypto/asn1/asn1_err.c */ /* ==================================================================== - * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -71,6 +71,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= {ERR_PACK(0,ASN1_F_A2I_ASN1_INTEGER,0), "a2i_ASN1_INTEGER"}, {ERR_PACK(0,ASN1_F_A2I_ASN1_STRING,0), "a2i_ASN1_STRING"}, {ERR_PACK(0,ASN1_F_APPEND_TAG,0), "APPEND_TAG"}, +{ERR_PACK(0,ASN1_F_ASN1_BIT_STRING_SET_BIT,0), "ASN1_BIT_STRING_set_bit"}, {ERR_PACK(0,ASN1_F_ASN1_CB,0), "ASN1_CB"}, {ERR_PACK(0,ASN1_F_ASN1_CHECK_TLEN,0), "ASN1_CHECK_TLEN"}, {ERR_PACK(0,ASN1_F_ASN1_COLLATE_PRIMITIVE,0), "ASN1_COLLATE_PRIMITIVE"}, @@ -78,10 +79,12 @@ static ERR_STRING_DATA ASN1_str_functs[]= {ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0), "ASN1_d2i_bio"}, {ERR_PACK(0,ASN1_F_ASN1_D2I_EX_PRIMITIVE,0), "ASN1_D2I_EX_PRIMITIVE"}, {ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0), "ASN1_d2i_fp"}, +{ERR_PACK(0,ASN1_F_ASN1_DIGEST,0), "ASN1_digest"}, {ERR_PACK(0,ASN1_F_ASN1_DO_ADB,0), "ASN1_DO_ADB"}, {ERR_PACK(0,ASN1_F_ASN1_DUP,0), "ASN1_dup"}, {ERR_PACK(0,ASN1_F_ASN1_ENUMERATED_SET,0), "ASN1_ENUMERATED_set"}, {ERR_PACK(0,ASN1_F_ASN1_ENUMERATED_TO_BN,0), "ASN1_ENUMERATED_to_BN"}, +{ERR_PACK(0,ASN1_F_ASN1_GENERALIZEDTIME_SET,0), "ASN1_GENERALIZEDTIME_set"}, {ERR_PACK(0,ASN1_F_ASN1_GENERATE_V3,0), "ASN1_generate_v3"}, {ERR_PACK(0,ASN1_F_ASN1_GET_OBJECT,0), "ASN1_get_object"}, {ERR_PACK(0,ASN1_F_ASN1_HEADER_NEW,0), "ASN1_HEADER_new"}, @@ -99,6 +102,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= {ERR_PACK(0,ASN1_F_ASN1_SEQ_UNPACK,0), "ASN1_seq_unpack"}, {ERR_PACK(0,ASN1_F_ASN1_SIGN,0), "ASN1_sign"}, {ERR_PACK(0,ASN1_F_ASN1_STR2TYPE,0), "ASN1_STR2TYPE"}, +{ERR_PACK(0,ASN1_F_ASN1_STRING_SET,0), "ASN1_STRING_set"}, {ERR_PACK(0,ASN1_F_ASN1_STRING_TABLE_ADD,0), "ASN1_STRING_TABLE_add"}, {ERR_PACK(0,ASN1_F_ASN1_STRING_TYPE_NEW,0), "ASN1_STRING_type_new"}, {ERR_PACK(0,ASN1_F_ASN1_TEMPLATE_D2I,0), "ASN1_TEMPLATE_D2I"}, @@ -108,6 +112,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= {ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING,0), "ASN1_TYPE_get_int_octetstring"}, {ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_OCTETSTRING,0), "ASN1_TYPE_get_octetstring"}, {ERR_PACK(0,ASN1_F_ASN1_UNPACK_STRING,0), "ASN1_unpack_string"}, +{ERR_PACK(0,ASN1_F_ASN1_UTCTIME_SET,0), "ASN1_UTCTIME_set"}, {ERR_PACK(0,ASN1_F_ASN1_VERIFY,0), "ASN1_verify"}, {ERR_PACK(0,ASN1_F_BITSTR_CB,0), "BITSTR_CB"}, {ERR_PACK(0,ASN1_F_BN_TO_ASN1_ENUMERATED,0), "BN_to_ASN1_ENUMERATED"}, @@ -132,6 +137,7 @@ static ERR_STRING_DATA ASN1_str_functs[]= {ERR_PACK(0,ASN1_F_D2I_X509_CINF,0), "D2I_X509_CINF"}, {ERR_PACK(0,ASN1_F_D2I_X509_NAME,0), "D2I_X509_NAME"}, {ERR_PACK(0,ASN1_F_D2I_X509_PKEY,0), "d2i_X509_PKEY"}, +{ERR_PACK(0,ASN1_F_I2D_ASN1_SET,0), "i2d_ASN1_SET"}, {ERR_PACK(0,ASN1_F_I2D_ASN1_TIME,0), "I2D_ASN1_TIME"}, {ERR_PACK(0,ASN1_F_I2D_DSA_PUBKEY,0), "i2d_DSA_PUBKEY"}, {ERR_PACK(0,ASN1_F_I2D_EC_PUBKEY,0), "i2d_EC_PUBKEY"}, diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 504e612a8..bb94257ce 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -378,6 +378,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len) if (str->data == NULL) { + ASN1err(ASN1_F_ASN1_STRING_SET,ERR_R_MALLOC_FAILURE); str->data=c; return(0); } diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c index 162b37bc3..f3d980486 100644 --- a/crypto/asn1/evp_asn1.c +++ b/crypto/asn1/evp_asn1.c @@ -115,7 +115,11 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data, if ((osp=ASN1_STRING_new()) == NULL) return(0); /* Grow the 'string' */ - ASN1_STRING_set(osp,NULL,size); + if (!ASN1_STRING_set(osp,NULL,size)) + { + ASN1_STRING_free(osp); + return(0); + } M_ASN1_STRING_length_set(osp, size); p=M_ASN1_STRING_data(osp); diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c index 891150638..ec788267e 100644 --- a/crypto/asn1/p5_pbe.c +++ b/crypto/asn1/p5_pbe.c @@ -76,47 +76,55 @@ IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM) X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, int saltlen) { - PBEPARAM *pbe; + PBEPARAM *pbe=NULL; ASN1_OBJECT *al; X509_ALGOR *algor; - ASN1_TYPE *astype; + ASN1_TYPE *astype=NULL; if (!(pbe = PBEPARAM_new ())) { ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } if(iter <= 0) iter = PKCS5_DEFAULT_ITER; - ASN1_INTEGER_set (pbe->iter, iter); + if (!ASN1_INTEGER_set(pbe->iter, iter)) { + ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); + goto err; + } if (!saltlen) saltlen = PKCS5_SALT_LEN; if (!(pbe->salt->data = OPENSSL_malloc (saltlen))) { ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } pbe->salt->length = saltlen; if (salt) memcpy (pbe->salt->data, salt, saltlen); else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0) - return NULL; + goto err; if (!(astype = ASN1_TYPE_new())) { ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } astype->type = V_ASN1_SEQUENCE; if(!ASN1_pack_string(pbe, i2d_PBEPARAM, &astype->value.sequence)) { ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } PBEPARAM_free (pbe); + pbe = NULL; al = OBJ_nid2obj(alg); /* never need to free al */ if (!(algor = X509_ALGOR_new())) { ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } ASN1_OBJECT_free(algor->algorithm); algor->algorithm = al; algor->parameter = astype; return (algor); +err: + if (pbe != NULL) PBEPARAM_free(pbe); + if (astype != NULL) ASN1_TYPE_free(astype); + return NULL; } diff --git a/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c index 8ee789f08..397332d9b 100644 --- a/crypto/asn1/t_bitst.c +++ b/crypto/asn1/t_bitst.c @@ -84,7 +84,10 @@ int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value, int bitnum; bitnum = ASN1_BIT_STRING_num_asc(name, tbl); if(bitnum < 0) return 0; - if(bs) ASN1_BIT_STRING_set_bit(bs, bitnum, value); + if(bs) { + if(!ASN1_BIT_STRING_set_bit(bs, bitnum, value)) + return 0; + } return 1; } diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 10b87def3..f631d2c68 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -83,8 +83,7 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_PUBKEY) int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) { - int ok=0; - X509_PUBKEY *pk; + X509_PUBKEY *pk=NULL; X509_ALGOR *a; ASN1_OBJECT *o; unsigned char *s,*p = NULL; @@ -107,7 +106,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) (a->parameter->type != V_ASN1_NULL)) { ASN1_TYPE_free(a->parameter); - a->parameter=ASN1_TYPE_new(); + if (!(a->parameter=ASN1_TYPE_new())) + { + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } a->parameter->type=V_ASN1_NULL; } } @@ -120,14 +123,34 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) dsa=pkey->pkey.dsa; dsa->write_params=0; ASN1_TYPE_free(a->parameter); - i=i2d_DSAparams(dsa,NULL); - if ((p=(unsigned char *)OPENSSL_malloc(i)) == NULL) goto err; + if ((i=i2d_DSAparams(dsa,NULL)) <= 0) + goto err; + if (!(p=(unsigned char *)OPENSSL_malloc(i))) + { + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } pp=p; i2d_DSAparams(dsa,&pp); - a->parameter=ASN1_TYPE_new(); + if (!(a->parameter=ASN1_TYPE_new())) + { + OPENSSL_free(p); + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } a->parameter->type=V_ASN1_SEQUENCE; - a->parameter->value.sequence=ASN1_STRING_new(); - ASN1_STRING_set(a->parameter->value.sequence,p,i); + if (!(a->parameter->value.sequence=ASN1_STRING_new())) + { + OPENSSL_free(p); + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } + if (!ASN1_STRING_set(a->parameter->value.sequence,p,i)) + { + OPENSSL_free(p); + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } OPENSSL_free(p); } #endif @@ -199,7 +222,12 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) } p=s; i2d_PublicKey(pkey,&p); - if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err; + if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) + { + X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE); + goto err; + } + /* Set number of unused bits to zero */ /* Set number of unused bits to zero */ pk->public_key->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); pk->public_key->flags|=ASN1_STRING_FLAG_BITS_LEFT; @@ -215,12 +243,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) X509_PUBKEY_free(*x); *x=pk; - pk=NULL; - ok=1; + return 1; err: if (pk != NULL) X509_PUBKEY_free(pk); - return(ok); + return 0; } EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c index 287392db0..61416483c 100644 --- a/crypto/bn/bn_mont.c +++ b/crypto/bn/bn_mont.c @@ -277,7 +277,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx) BN_CTX_start(ctx); if((Ri = BN_CTX_get(ctx)) == NULL) goto err; R= &(mont->RR); /* grab RR as a temp */ - BN_copy(&(mont->N),mod); /* Set N */ + if (!BN_copy(&(mont->N),mod)) goto err; /* Set N */ mont->N.neg = 0; #ifdef MONT_WORD diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index e81b810de..e752c2073 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -341,7 +341,11 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken) return NULL; } p8->broken = broken; - ASN1_INTEGER_set (p8->version, 0); + if (!ASN1_INTEGER_set(p8->version, 0)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + PKCS8_PRIV_KEY_INFO_free (p8); + return NULL; + } if (!(p8->pkeyalg->parameter = ASN1_TYPE_new ())) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); PKCS8_PRIV_KEY_INFO_free (p8); @@ -418,29 +422,35 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken) #ifndef OPENSSL_NO_DSA static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) { - ASN1_STRING *params; - ASN1_INTEGER *prkey; - ASN1_TYPE *ttmp; - STACK_OF(ASN1_TYPE) *ndsa; - unsigned char *p, *q; + ASN1_STRING *params = NULL; + ASN1_INTEGER *prkey = NULL; + ASN1_TYPE *ttmp = NULL; + STACK_OF(ASN1_TYPE) *ndsa = NULL; + unsigned char *p = NULL, *q; int len; p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa); len = i2d_DSAparams (pkey->pkey.dsa, NULL); if (!(p = OPENSSL_malloc(len))) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); - PKCS8_PRIV_KEY_INFO_free (p8); - return 0; + goto err; } q = p; i2d_DSAparams (pkey->pkey.dsa, &q); - params = ASN1_STRING_new(); - ASN1_STRING_set(params, p, len); + if (!(params = ASN1_STRING_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + if (!ASN1_STRING_set(params, p, len)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } OPENSSL_free(p); + p = NULL; /* Get private key into integer */ if (!(prkey = BN_to_ASN1_INTEGER (pkey->pkey.dsa->priv_key, NULL))) { EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR); - return 0; + goto err; } switch(p8->broken) { @@ -451,12 +461,13 @@ static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) if (!ASN1_pack_string((char *)prkey, i2d_ASN1_INTEGER, &p8->pkey->value.octet_string)) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); - M_ASN1_INTEGER_free (prkey); - return 0; + goto err; } M_ASN1_INTEGER_free (prkey); + prkey = NULL; p8->pkeyalg->parameter->value.sequence = params; + params = NULL; p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE; break; @@ -464,32 +475,51 @@ static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) case PKCS8_NS_DB: p8->pkeyalg->parameter->value.sequence = params; + params = NULL; p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE; - ndsa = sk_ASN1_TYPE_new_null(); - ttmp = ASN1_TYPE_new(); - if (!(ttmp->value.integer = BN_to_ASN1_INTEGER (pkey->pkey.dsa->pub_key, NULL))) { + if (!(ndsa = sk_ASN1_TYPE_new_null())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + if (!(ttmp = ASN1_TYPE_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + if (!(ttmp->value.integer = + BN_to_ASN1_INTEGER(pkey->pkey.dsa->pub_key, NULL))) { EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR); - PKCS8_PRIV_KEY_INFO_free(p8); - return 0; + goto err; } ttmp->type = V_ASN1_INTEGER; - sk_ASN1_TYPE_push(ndsa, ttmp); + if (!sk_ASN1_TYPE_push(ndsa, ttmp)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } - ttmp = ASN1_TYPE_new(); + if (!(ttmp = ASN1_TYPE_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } ttmp->value.integer = prkey; + prkey = NULL; ttmp->type = V_ASN1_INTEGER; - sk_ASN1_TYPE_push(ndsa, ttmp); + if (!sk_ASN1_TYPE_push(ndsa, ttmp)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + ttmp = NULL; - p8->pkey->value.octet_string = ASN1_OCTET_STRING_new(); + if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE, &p8->pkey->value.octet_string->data, &p8->pkey->value.octet_string->length)) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); - sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free); - M_ASN1_INTEGER_free(prkey); - return 0; + goto err; } sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free); break; @@ -497,32 +527,58 @@ static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) case PKCS8_EMBEDDED_PARAM: p8->pkeyalg->parameter->type = V_ASN1_NULL; - ndsa = sk_ASN1_TYPE_new_null(); - ttmp = ASN1_TYPE_new(); + if (!(ndsa = sk_ASN1_TYPE_new_null())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + if (!(ttmp = ASN1_TYPE_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } ttmp->value.sequence = params; + params = NULL; ttmp->type = V_ASN1_SEQUENCE; - sk_ASN1_TYPE_push(ndsa, ttmp); + if (!sk_ASN1_TYPE_push(ndsa, ttmp)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } - ttmp = ASN1_TYPE_new(); + if (!(ttmp = ASN1_TYPE_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } ttmp->value.integer = prkey; + prkey = NULL; ttmp->type = V_ASN1_INTEGER; - sk_ASN1_TYPE_push(ndsa, ttmp); + if (!sk_ASN1_TYPE_push(ndsa, ttmp)) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } + ttmp = NULL; - p8->pkey->value.octet_string = ASN1_OCTET_STRING_new(); + if (!(p8->pkey->value.octet_string = ASN1_OCTET_STRING_new())) { + EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); + goto err; + } if (!ASN1_seq_pack_ASN1_TYPE(ndsa, i2d_ASN1_TYPE, &p8->pkey->value.octet_string->data, &p8->pkey->value.octet_string->length)) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); - sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free); - M_ASN1_INTEGER_free (prkey); - return 0; + goto err; } sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free); break; } return 1; +err: + if (p != NULL) OPENSSL_free(p); + if (params != NULL) ASN1_STRING_free(params); + if (prkey != NULL) M_ASN1_INTEGER_free(prkey); + if (ttmp != NULL) ASN1_TYPE_free(ttmp); + if (ndsa != NULL) sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free); + return 0; } #endif diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index b4453b4a9..28c9370ca 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -80,7 +81,11 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *), MemCheck_off(); name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS)); MemCheck_on(); - if (!name_funcs) return(0); + if (!name_funcs) + { + OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX,ERR_R_MALLOC_FAILURE); + return(0); + } name_funcs->hash_func = lh_strhash; name_funcs->cmp_func = OPENSSL_strcmp; name_funcs->free_func = 0; /* NULL is often declared to diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index dbff4e075..15f813a48 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -236,13 +236,13 @@ int OBJ_add_object(const ASN1_OBJECT *obj) if (added == NULL) if (!init_added()) return(0); if ((o=OBJ_dup(obj)) == NULL) goto err; - if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err; + if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if ((o->length != 0) && (obj->data != NULL)) - ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); + if (!(ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->sn != NULL) - ao[ADDED_SNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); + if (!(ao[ADDED_SNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; if (o->ln != NULL) - ao[ADDED_LNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); + if (!(ao[ADDED_LNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err2; for (i=ADDED_DATA; i<=ADDED_NID; i++) { @@ -260,6 +260,8 @@ int OBJ_add_object(const ASN1_OBJECT *obj) ASN1_OBJECT_FLAG_DYNAMIC_DATA); return(o->nid); +err2: + OBJerr(OBJ_F_OBJ_ADD_OBJECT,ERR_R_MALLOC_FAILURE); err: for (i=ADDED_DATA; i<=ADDED_NID; i++) if (ao[i] != NULL) OPENSSL_free(ao[i]); @@ -669,7 +671,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln) if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL) { - OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE); + OBJerr(OBJ_F_OBJ_CREATE,ERR_R_MALLOC_FAILURE); return(0); } i=a2d_ASN1_OBJECT(buf,i,oid,-1); diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c index 80ab6855a..2b5f43e3c 100644 --- a/crypto/objects/obj_err.c +++ b/crypto/objects/obj_err.c @@ -1,6 +1,6 @@ /* crypto/objects/obj_err.c */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -66,8 +66,10 @@ #ifndef OPENSSL_NO_ERR static ERR_STRING_DATA OBJ_str_functs[]= { +{ERR_PACK(0,OBJ_F_OBJ_ADD_OBJECT,0), "OBJ_add_object"}, {ERR_PACK(0,OBJ_F_OBJ_CREATE,0), "OBJ_create"}, {ERR_PACK(0,OBJ_F_OBJ_DUP,0), "OBJ_dup"}, +{ERR_PACK(0,OBJ_F_OBJ_NAME_NEW_INDEX,0), "OBJ_NAME_new_index"}, {ERR_PACK(0,OBJ_F_OBJ_NID2LN,0), "OBJ_nid2ln"}, {ERR_PACK(0,OBJ_F_OBJ_NID2OBJ,0), "OBJ_nid2obj"}, {ERR_PACK(0,OBJ_F_OBJ_NID2SN,0), "OBJ_nid2sn"}, diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h index 8b509516f..7242f76fb 100644 --- a/crypto/objects/objects.h +++ b/crypto/objects/objects.h @@ -1031,8 +1031,10 @@ void ERR_load_OBJ_strings(void); /* Error codes for the OBJ functions. */ /* Function codes. */ +#define OBJ_F_OBJ_ADD_OBJECT 105 #define OBJ_F_OBJ_CREATE 100 #define OBJ_F_OBJ_DUP 101 +#define OBJ_F_OBJ_NAME_NEW_INDEX 106 #define OBJ_F_OBJ_NID2LN 102 #define OBJ_F_OBJ_NID2OBJ 103 #define OBJ_F_OBJ_NID2SN 104 diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 7a383f3df..49db780be 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -303,7 +303,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, if ((dsize=i2d(x,NULL)) < 0) { - PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,ERR_R_MALLOC_FAILURE); + PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,ERR_R_ASN1_LIB); dsize=0; goto err; } diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c index eb837a78c..5276b1266 100644 --- a/crypto/pkcs12/p12_init.c +++ b/crypto/pkcs12/p12_init.c @@ -76,15 +76,17 @@ PKCS12 *PKCS12_init (int mode) if (!(pkcs12->authsafes->d.data = M_ASN1_OCTET_STRING_new())) { PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } break; default: - PKCS12err(PKCS12_F_PKCS12_INIT,PKCS12_R_UNSUPPORTED_PKCS12_MODE); - PKCS12_free(pkcs12); - return NULL; - break; + PKCS12err(PKCS12_F_PKCS12_INIT, + PKCS12_R_UNSUPPORTED_PKCS12_MODE); + goto err; } return pkcs12; +err: + if (pkcs12 != NULL) PKCS12_free(pkcs12); + return NULL; } diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 885087ad0..2b31999e1 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -249,14 +249,26 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate ) return 1; if (!(x509 = PKCS12_certbag2x509(bag))) return 0; - if(ckid) X509_keyid_set1(x509, ckid->data, ckid->length); + if(ckid) + { + if (!X509_keyid_set1(x509, ckid->data, ckid->length)) + { + X509_free(x509); + return 0; + } + } if(fname) { - int len; + int len, r; unsigned char *data; len = ASN1_STRING_to_UTF8(&data, fname); if(len > 0) { - X509_alias_set1(x509, data, len); + r = X509_alias_set1(x509, data, len); OPENSSL_free(data); + if (!r) + { + X509_free(x509); + return 0; + } } } diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 0fb67f74b..4886b9b28 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -148,7 +148,10 @@ int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen, PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); return 0; } - ASN1_INTEGER_set(p12->mac->iter, iter); + if (!ASN1_INTEGER_set(p12->mac->iter, iter)) { + PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE); + return 0; + } } if (!saltlen) saltlen = PKCS12_SALT_LEN; p12->mac->salt->length = saltlen; diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 25483bc15..8d98a8521 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -263,7 +263,13 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) OPENSSL_free(tmp); goto err; } - M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj); + if (!M_ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj)) + { + PKCS7err(PKCS7_F_PKCS7_DATAINIT, + ERR_R_MALLOC_FAILURE); + OPENSSL_free(tmp); + goto err; + } } OPENSSL_free(tmp); OPENSSL_cleanse(key, keylen); @@ -559,12 +565,20 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) case NID_pkcs7_signedAndEnveloped: /* XXXXXXXXXXXXXXXX */ si_sk=p7->d.signed_and_enveloped->signer_info; - os=M_ASN1_OCTET_STRING_new(); + if (!(os=M_ASN1_OCTET_STRING_new())) + { + PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_MALLOC_FAILURE); + goto err; + } p7->d.signed_and_enveloped->enc_data->enc_data=os; break; case NID_pkcs7_enveloped: /* XXXXXXXXXXXXXXXX */ - os=M_ASN1_OCTET_STRING_new(); + if (!(os=M_ASN1_OCTET_STRING_new())) + { + PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_MALLOC_FAILURE); + goto err; + } p7->d.enveloped->enc_data->enc_data=os; break; case NID_pkcs7_signed: @@ -635,7 +649,12 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) if (!PKCS7_get_signed_attribute(si, NID_pkcs9_signingTime)) { - sign_time=X509_gmtime_adj(NULL,0); + if (!(sign_time=X509_gmtime_adj(NULL,0))) + { + PKCS7err(PKCS7_F_PKCS7_DATASIGN, + ERR_R_MALLOC_FAILURE); + goto err; + } PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime, V_ASN1_UTCTIME,sign_time); @@ -644,8 +663,19 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) /* Add digest */ md_tmp=EVP_MD_CTX_md(&ctx_tmp); EVP_DigestFinal_ex(&ctx_tmp,md_data,&md_len); - digest=M_ASN1_OCTET_STRING_new(); - M_ASN1_OCTET_STRING_set(digest,md_data,md_len); + if (!(digest=M_ASN1_OCTET_STRING_new())) + { + PKCS7err(PKCS7_F_PKCS7_DATASIGN, + ERR_R_MALLOC_FAILURE); + goto err; + } + if (!M_ASN1_OCTET_STRING_set(digest,md_data, + md_len)) + { + PKCS7err(PKCS7_F_PKCS7_DATASIGN, + ERR_R_MALLOC_FAILURE); + goto err; + } PKCS7_add_signed_attribute(si, NID_pkcs9_messageDigest, V_ASN1_OCTET_STRING,digest); diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c index 70ee44be8..a45a0f064 100644 --- a/crypto/pkcs7/pk7_lib.c +++ b/crypto/pkcs7/pk7_lib.c @@ -168,7 +168,12 @@ int PKCS7_set_type(PKCS7 *p7, int type) p7->type=obj; if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL) goto err; - ASN1_INTEGER_set(p7->d.sign->version,1); + if (!ASN1_INTEGER_set(p7->d.sign->version,1)) + { + PKCS7_SIGNED_free(p7->d.sign); + p7->d.sign=NULL; + goto err; + } break; case NID_pkcs7_data: p7->type=obj; @@ -180,6 +185,9 @@ int PKCS7_set_type(PKCS7 *p7, int type) if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new()) == NULL) goto err; ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1); + if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1)) + goto err; + break; p7->d.signed_and_enveloped->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data); break; @@ -187,7 +195,8 @@ int PKCS7_set_type(PKCS7 *p7, int type) p7->type=obj; if ((p7->d.enveloped=PKCS7_ENVELOPE_new()) == NULL) goto err; - ASN1_INTEGER_set(p7->d.enveloped->version,0); + if (!ASN1_INTEGER_set(p7->d.enveloped->version,0)) + goto err; p7->d.enveloped->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data); break; @@ -195,7 +204,8 @@ int PKCS7_set_type(PKCS7 *p7, int type) p7->type=obj; if ((p7->d.encrypted=PKCS7_ENCRYPT_new()) == NULL) goto err; - ASN1_INTEGER_set(p7->d.encrypted->version,0); + if (!ASN1_INTEGER_set(p7->d.encrypted->version,0)) + goto err; p7->d.encrypted->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data); break; @@ -204,7 +214,8 @@ int PKCS7_set_type(PKCS7 *p7, int type) p7->type=obj; if ((p7->d.digest=PKCS7_DIGEST_new()) == NULL) goto err; - ASN1_INTEGER_set(p7->d.digest->version,0); + if (!ASN1_INTEGER_set(p7->d.digest->version,0)) + goto err; break; default: PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); @@ -338,15 +349,18 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, else is_dsa = 0; /* We now need to add another PKCS7_SIGNER_INFO entry */ - ASN1_INTEGER_set(p7i->version,1); - X509_NAME_set(&p7i->issuer_and_serial->issuer, - X509_get_issuer_name(x509)); + if (!ASN1_INTEGER_set(p7i->version,1)) + goto err; + if (!X509_NAME_set(&p7i->issuer_and_serial->issuer, + X509_get_issuer_name(x509))) + goto err; /* because ASN1_INTEGER_set is used to set a 'long' we will do * things the ugly way. */ M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial); - p7i->issuer_and_serial->serial= - M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)); + if (!(p7i->issuer_and_serial->serial= + M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)))) + goto err; /* lets keep the pkey around for a while */ CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); @@ -483,16 +497,20 @@ int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri) int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) { - ASN1_INTEGER_set(p7i->version,0); - X509_NAME_set(&p7i->issuer_and_serial->issuer, - X509_get_issuer_name(x509)); + if (!ASN1_INTEGER_set(p7i->version,0)) + return 0; + if (!X509_NAME_set(&p7i->issuer_and_serial->issuer, + X509_get_issuer_name(x509))) + return 0; M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial); - p7i->issuer_and_serial->serial= - M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)); + if (!(p7i->issuer_and_serial->serial= + M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)))) + return 0; X509_ALGOR_free(p7i->key_enc_algor); - p7i->key_enc_algor= X509_ALGOR_dup(x509->cert_info->key->algor); + if (!(p7i->key_enc_algor= X509_ALGOR_dup(x509->cert_info->key->algor))) + return 0; CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509); p7i->cert=x509; diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c index 1e9339367..f98e0a80a 100644 --- a/crypto/rsa/rsa_saos.c +++ b/crypto/rsa/rsa_saos.c @@ -140,8 +140,11 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype, ret=1; err: if (sig != NULL) M_ASN1_OCTET_STRING_free(sig); - OPENSSL_cleanse(s,(unsigned int)siglen); - OPENSSL_free(s); + if (s != NULL) + { + OPENSSL_cleanse(s,(unsigned int)siglen); + OPENSSL_free(s); + } return(ret); } diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c index e50c83927..9e7dfd192 100644 --- a/crypto/rsa/rsa_sign.c +++ b/crypto/rsa/rsa_sign.c @@ -169,7 +169,7 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len, } if((dtype == NID_md5_sha1) && (m_len != SSL_SIG_LENGTH) ) { RSAerr(RSA_F_RSA_VERIFY,RSA_R_INVALID_MESSAGE_LENGTH); - return(0); + goto err; } i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING); @@ -222,8 +222,11 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len, } err: if (sig != NULL) X509_SIG_free(sig); - OPENSSL_cleanse(s,(unsigned int)siglen); - OPENSSL_free(s); + if (s != NULL) + { + OPENSSL_cleanse(s,(unsigned int)siglen); + OPENSSL_free(s); + } return(ret); } diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c index db051033d..fb8a78dab 100644 --- a/crypto/x509/x509_r2x.c +++ b/crypto/x509/x509_r2x.c @@ -92,8 +92,10 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) X509_set_subject_name(ret,X509_NAME_dup(xn)); X509_set_issuer_name(ret,X509_NAME_dup(xn)); - X509_gmtime_adj(xi->validity->notBefore,0); - X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days); + if (X509_gmtime_adj(xi->validity->notBefore,0) == NULL) + goto err; + if (X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days) == NULL) + goto err; X509_set_pubkey(ret,X509_REQ_get_pubkey(r)); diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 5e2cc82c5..c6c83ad72 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -1054,7 +1054,8 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time) atm.length=sizeof(buff2); atm.data=(unsigned char *)buff2; - X509_time_adj(&atm,-offset*60, cmp_time); + if (X509_time_adj(&atm,-offset*60, cmp_time) == NULL) + return 0; if (ctm->type == V_ASN1_UTCTIME) { diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c index 42d5f8bef..170c8d280 100644 --- a/crypto/x509v3/v3_bitst.c +++ b/crypto/x509v3/v3_bitst.c @@ -118,7 +118,12 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, for(bnam = method->usr_data; bnam->lname; bnam++) { if(!strcmp(bnam->sname, val->name) || !strcmp(bnam->lname, val->name) ) { - ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1); + if(!ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1)) { + X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, + ERR_R_MALLOC_FAILURE); + M_ASN1_BIT_STRING_free(bs); + return NULL; + } break; } } diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c index f9414456d..9683afa47 100644 --- a/crypto/x509v3/v3_ia5.c +++ b/crypto/x509v3/v3_ia5.c @@ -82,7 +82,10 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, { char *tmp; if(!ia5 || !ia5->length) return NULL; - if (!(tmp = OPENSSL_malloc(ia5->length + 1))) return NULL; + if(!(tmp = OPENSSL_malloc(ia5->length + 1))) { + X509V3err(X509V3_F_I2S_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE); + return NULL; + } memcpy(tmp, ia5->data, ia5->length); tmp[ia5->length] = 0; return tmp; diff --git a/crypto/x509v3/v3err.c b/crypto/x509v3/v3err.c index 648ed3562..2e210799d 100644 --- a/crypto/x509v3/v3err.c +++ b/crypto/x509v3/v3err.c @@ -74,6 +74,7 @@ static ERR_STRING_DATA X509V3_str_functs[]= {ERR_PACK(0,X509V3_F_DO_I2V_NAME_CONSTRAINTS,0), "DO_I2V_NAME_CONSTRAINTS"}, {ERR_PACK(0,X509V3_F_HEX_TO_STRING,0), "hex_to_string"}, {ERR_PACK(0,X509V3_F_I2S_ASN1_ENUMERATED,0), "i2s_ASN1_ENUMERATED"}, +{ERR_PACK(0,X509V3_F_I2S_ASN1_IA5STRING,0), "I2S_ASN1_IA5STRING"}, {ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0), "i2s_ASN1_INTEGER"}, {ERR_PACK(0,X509V3_F_I2V_AUTHORITY_INFO_ACCESS,0), "I2V_AUTHORITY_INFO_ACCESS"}, {ERR_PACK(0,X509V3_F_NOTICE_SECTION,0), "NOTICE_SECTION"}, @@ -92,7 +93,7 @@ static ERR_STRING_DATA X509V3_str_functs[]= {ERR_PACK(0,X509V3_F_SXNET_GET_ID_ASC,0), "SXNET_get_id_asc"}, {ERR_PACK(0,X509V3_F_SXNET_GET_ID_ULONG,0), "SXNET_get_id_ulong"}, {ERR_PACK(0,X509V3_F_V2I_ACCESS_DESCRIPTION,0), "V2I_ACCESS_DESCRIPTION"}, -{ERR_PACK(0,X509V3_F_V2I_ASN1_BIT_STRING,0), "V2I_ASN1_BIT_STRING"}, +{ERR_PACK(0,X509V3_F_V2I_ASN1_BIT_STRING,0), "v2i_ASN1_BIT_STRING"}, {ERR_PACK(0,X509V3_F_V2I_AUTHORITY_KEYID,0), "V2I_AUTHORITY_KEYID"}, {ERR_PACK(0,X509V3_F_V2I_BASIC_CONSTRAINTS,0), "V2I_BASIC_CONSTRAINTS"}, {ERR_PACK(0,X509V3_F_V2I_CRLD,0), "V2I_CRLD"}, diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index a6436289c..4ade7cf6e 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -624,6 +624,7 @@ void ERR_load_X509V3_strings(void); #define X509V3_F_DO_I2V_NAME_CONSTRAINTS 148 #define X509V3_F_HEX_TO_STRING 111 #define X509V3_F_I2S_ASN1_ENUMERATED 121 +#define X509V3_F_I2S_ASN1_IA5STRING 149 #define X509V3_F_I2S_ASN1_INTEGER 120 #define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 138 #define X509V3_F_NOTICE_SECTION 132 From 41c70d47d72ac6e11fcc1eb899a1f2d7ebdb08b1 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 5 Dec 2004 01:50:56 +0000 Subject: [PATCH 10/12] Remaing bits of PR:620 relevant to 0.9.8. --- crypto/dsa/dsa_gen.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index 878dc67ad..74da6becd 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -139,7 +139,8 @@ static int dsa_builtin_paramgen(DSA *ret, int bits, p = BN_CTX_get(ctx); test = BN_CTX_get(ctx); - BN_lshift(test,BN_value_one(),bits-1); + if (!BN_lshift(test,BN_value_one(),bits-1)) + goto err; for (;;) { @@ -209,7 +210,7 @@ static int dsa_builtin_paramgen(DSA *ret, int bits, goto err; /* step 7 */ - BN_zero(W); + if (!BN_zero(W)) goto err; /* now 'buf' contains "SEED + offset - 1" */ for (k=0; k<=n; k++) { @@ -225,20 +226,20 @@ static int dsa_builtin_paramgen(DSA *ret, int bits, /* step 8 */ if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0)) goto err; - BN_lshift(r0,r0,160*k); - BN_add(W,W,r0); + if (!BN_lshift(r0,r0,160*k)) goto err; + if (!BN_add(W,W,r0)) goto err; } /* more of step 8 */ - BN_mask_bits(W,bits-1); - BN_copy(X,W); /* this should be ok */ - BN_add(X,X,test); /* this should be ok */ + if (!BN_mask_bits(W,bits-1)) goto err; + if (!BN_copy(X,W)) goto err; + if (!BN_add(X,X,test)) goto err; /* step 9 */ - BN_lshift1(r0,q); - BN_mod(c,X,r0,ctx); - BN_sub(r0,c,BN_value_one()); - BN_sub(p,X,r0); + if (!BN_lshift1(r0,q)) goto err; + if (!BN_mod(c,X,r0,ctx)) goto err; + if (!BN_sub(r0,c,BN_value_one())) goto err; + if (!BN_sub(p,X,r0)) goto err; /* step 10 */ if (BN_cmp(p,test) >= 0) @@ -266,18 +267,18 @@ end: /* We now need to generate g */ /* Set r0=(p-1)/q */ - BN_sub(test,p,BN_value_one()); - BN_div(r0,NULL,test,q,ctx); + if (!BN_sub(test,p,BN_value_one())) goto err; + if (!BN_div(r0,NULL,test,q,ctx)) goto err; - BN_set_word(test,h); - BN_MONT_CTX_set(mont,p,ctx); + if (!BN_set_word(test,h)) goto err; + if (!BN_MONT_CTX_set(mont,p,ctx)) goto err; for (;;) { /* g=test^r0%p */ - BN_mod_exp_mont(g,test,r0,p,ctx,mont); + if (!BN_mod_exp_mont(g,test,r0,p,ctx,mont)) goto err; if (!BN_is_one(g)) break; - BN_add(test,test,BN_value_one()); + if (!BN_add(test,test,BN_value_one())) goto err; h++; } @@ -294,6 +295,11 @@ err: ret->p=BN_dup(p); ret->q=BN_dup(q); ret->g=BN_dup(g); + if (ret->p == NULL || ret->q == NULL || ret->g == NULL) + { + ok=0; + goto err; + } if ((m > 1) && (seed_in != NULL)) memcpy(seed_in,seed,20); if (counter_ret != NULL) *counter_ret=counter; if (h_ret != NULL) *h_ret=h; From a37e22d866294c25747b7546e6390bfe792fc3c5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 5 Dec 2004 18:26:19 +0000 Subject: [PATCH 11/12] Use X509_cmp_time() in -checkend option, to support GeneralizedTime. --- apps/x509.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/x509.c b/apps/x509.c index b2288b69c..294fc6957 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -999,9 +999,9 @@ bad: if (checkend) { - time_t tnow=time(NULL); + time_t tcheck=time(NULL) + checkoffset; - if (ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(x), tnow+checkoffset) == -1) + if (X509_cmp_time(X509_get_notAfter(x), &tcheck) < 0) { BIO_printf(out,"Certificate will expire\n"); ret=1; From 3dfa23cbc4b9d39627b7de2fec4b2d61d347f077 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 5 Dec 2004 19:48:02 +0000 Subject: [PATCH 12/12] Update 'certs' directory. Move expired certificates to expired directory and zero assurance demontrations CAs to 'demo'. --- certs/ICE-CA.pem | 59 ------------------------------ certs/ICE-root.pem | 48 ------------------------ certs/ICE-user.pem | 63 -------------------------------- certs/ICE.crl | 9 ----- certs/{ => demo}/ca-cert.pem | 0 certs/{ => demo}/dsa-ca.pem | 0 certs/{ => demo}/dsa-pca.pem | 0 certs/{ => demo}/nortelCA.pem | 0 certs/{ => demo}/pca-cert.pem | 0 certs/{ => demo}/timCA.pem | 0 certs/{ => demo}/tjhCA.pem | 0 certs/{ => demo}/vsigntca.pem | 0 certs/{ => expired}/RegTP-4R.pem | 0 certs/{ => expired}/factory.pem | 0 certs/{ => expired}/rsa-cca.pem | 0 certs/{ => expired}/vsign2.pem | 0 certs/wellsfgo.pem | 23 ++++++++++++ 17 files changed, 23 insertions(+), 179 deletions(-) delete mode 100644 certs/ICE-CA.pem delete mode 100644 certs/ICE-root.pem delete mode 100644 certs/ICE-user.pem delete mode 100644 certs/ICE.crl rename certs/{ => demo}/ca-cert.pem (100%) rename certs/{ => demo}/dsa-ca.pem (100%) rename certs/{ => demo}/dsa-pca.pem (100%) rename certs/{ => demo}/nortelCA.pem (100%) rename certs/{ => demo}/pca-cert.pem (100%) rename certs/{ => demo}/timCA.pem (100%) rename certs/{ => demo}/tjhCA.pem (100%) rename certs/{ => demo}/vsigntca.pem (100%) rename certs/{ => expired}/RegTP-4R.pem (100%) rename certs/{ => expired}/factory.pem (100%) rename certs/{ => expired}/rsa-cca.pem (100%) rename certs/{ => expired}/vsign2.pem (100%) create mode 100644 certs/wellsfgo.pem diff --git a/certs/ICE-CA.pem b/certs/ICE-CA.pem deleted file mode 100644 index 75652366c..000000000 --- a/certs/ICE-CA.pem +++ /dev/null @@ -1,59 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption - Issuer: O=European ICE-TEL project, OU=V3-Certification Authority - Validity - Not Before: Apr 2 17:35:53 1997 GMT - Not After : Apr 2 17:35:53 1998 GMT - Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt - Subject Public Key Info: - Public Key Algorithm: rsa - RSA Public Key: (512 bit) - Modulus (512 bit): - 00:82:75:ba:f6:d1:60:b5:f9:15:b3:6a:dd:29:8f: - 8b:a4:6f:1a:88:e0:50:43:40:0b:79:41:d5:d3:16: - 44:7d:74:65:17:42:06:52:0b:e9:50:c8:10:cd:24: - e2:ae:8d:22:30:73:e6:b4:b7:93:1f:e5:6e:a2:ae: - 49:11:a5:c9:45 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Authority Key Identifier: - 0.........z.."p......e.. - X509v3 Subject Key Identifier: - ..~r..:..B.44fu......3 - X509v3 Key Usage: critical - .... - X509v3 Certificate Policies: critical - 0.0...*... - X509v3 Subject Alternative Name: - 0!..secude-support@darmstadt.gmd.de - X509v3 Issuer Alternative Name: - 0I..ice-tel-ca@darmstadt.gmd.de.*http://www.darmstadt.gmd.de/ice-tel/euroca - X509v3 Basic Constraints: critical - 0.... - X509v3 CRL Distribution Points: - 0200...,.*http://www.darmstadt.gmd.de/ice-tel/euroca - Signature Algorithm: md5WithRSAEncryption - 17:a2:88:b7:99:5a:05:41:e4:13:34:67:e6:1f:3e:26:ec:4b: - 69:f9:3e:28:22:be:9d:1c:ab:41:6f:0c:00:85:fe:45:74:f6: - 98:f0:ce:9b:65:53:4a:50:42:c7:d4:92:bd:d7:a2:a8:3d:98: - 88:73:cd:60:28:79:a3:fc:48:7a ------BEGIN CERTIFICATE----- -MIICzDCCAnagAwIBAgIBATANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv -cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g -QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzU1M1oXDTk4MDQwMjE3MzU1M1owXDEhMB8G -A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eTESMBAGA1UEBxMJRGFybXN0YWR0MFkwCgYEVQgB -AQICAgADSwAwSAJBAIJ1uvbRYLX5FbNq3SmPi6RvGojgUENAC3lB1dMWRH10ZRdC -BlIL6VDIEM0k4q6NIjBz5rS3kx/lbqKuSRGlyUUCAwEAAaOCATgwggE0MB8GA1Ud -IwQYMBaAFIr3yNUOx3ro1yJw4AuJ1bbsZbzPMB0GA1UdDgQWBBR+cvL4OoacQog0 -NGZ1w9T80aIRMzAOBgNVHQ8BAf8EBAMCAfYwFAYDVR0gAQH/BAowCDAGBgQqAwQF -MCoGA1UdEQQjMCGBH3NlY3VkZS1zdXBwb3J0QGRhcm1zdGFkdC5nbWQuZGUwUgYD -VR0SBEswSYEbaWNlLXRlbC1jYUBkYXJtc3RhZHQuZ21kLmRlhipodHRwOi8vd3d3 -LmRhcm1zdGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2EwDwYDVR0TAQH/BAUwAwEB -/zA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vd3d3LmRhcm1zdGFkdC5nbWQuZGUv -aWNlLXRlbC9ldXJvY2EwDQYJKoZIhvcNAQEEBQADQQAXooi3mVoFQeQTNGfmHz4m -7Etp+T4oIr6dHKtBbwwAhf5FdPaY8M6bZVNKUELH1JK916KoPZiIc81gKHmj/Eh6 ------END CERTIFICATE----- diff --git a/certs/ICE-root.pem b/certs/ICE-root.pem deleted file mode 100644 index fa991599c..000000000 --- a/certs/ICE-root.pem +++ /dev/null @@ -1,48 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 0 (0x0) - Signature Algorithm: md5WithRSAEncryption - Issuer: O=European ICE-TEL project, OU=V3-Certification Authority - Validity - Not Before: Apr 2 17:33:36 1997 GMT - Not After : Apr 2 17:33:36 1998 GMT - Subject: O=European ICE-TEL project, OU=V3-Certification Authority - Subject Public Key Info: - Public Key Algorithm: rsa - RSA Public Key: (512 bit) - Modulus (512 bit): - 00:80:3e:eb:ae:47:a9:fe:10:54:0b:81:8b:9c:2b: - 82:ab:3a:61:36:65:8b:f3:73:9f:ac:ac:7a:15:a7: - 13:8f:b4:c4:ba:a3:0f:bc:a5:58:8d:cc:b1:93:31: - 9e:81:9e:8c:19:61:86:fa:52:73:54:d1:97:76:22: - e7:c7:9f:41:cd - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - ........z.."p......e.. - X509v3 Key Usage: critical - .... - X509v3 Subject Alternative Name: - 0I.*http://www.darmstadt.gmd.de/ice-tel/euroca..ice-tel-ca@darmstadt.gmd.de - X509v3 Basic Constraints: critical - 0.... - Signature Algorithm: md5WithRSAEncryption - 76:69:61:db:b7:cf:8b:06:9e:d8:8c:96:53:d2:4d:a8:23:a6: - 03:44:e8:8f:24:a5:c0:84:a8:4b:77:d4:2d:2b:7d:37:91:67: - f2:2c:ce:02:31:4c:6b:cc:ce:f2:68:a6:11:11:ab:7d:88:b8: - 7e:22:9f:25:06:60:bd:79:30:3d ------BEGIN CERTIFICATE----- -MIICFjCCAcCgAwIBAgIBADANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv -cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g -QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzMzNloXDTk4MDQwMjE3MzMzNlowSDEhMB8G -A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0 -aWZpY2F0aW9uIEF1dGhvcml0eTBZMAoGBFUIAQECAgIAA0sAMEgCQQCAPuuuR6n+ -EFQLgYucK4KrOmE2ZYvzc5+srHoVpxOPtMS6ow+8pViNzLGTMZ6BnowZYYb6UnNU -0Zd2IufHn0HNAgMBAAGjgZcwgZQwHQYDVR0OBBYEFIr3yNUOx3ro1yJw4AuJ1bbs -ZbzPMA4GA1UdDwEB/wQEAwIB9jBSBgNVHREESzBJhipodHRwOi8vd3d3LmRhcm1z -dGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2GBG2ljZS10ZWwtY2FAZGFybXN0YWR0 -LmdtZC5kZTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA0EAdmlh27fP -iwae2IyWU9JNqCOmA0TojySlwISoS3fULSt9N5Fn8izOAjFMa8zO8mimERGrfYi4 -fiKfJQZgvXkwPQ== ------END CERTIFICATE----- diff --git a/certs/ICE-user.pem b/certs/ICE-user.pem deleted file mode 100644 index 28065fd37..000000000 --- a/certs/ICE-user.pem +++ /dev/null @@ -1,63 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption - Issuer: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt - Validity - Not Before: Apr 2 17:35:59 1997 GMT - Not After : Apr 2 17:35:59 1998 GMT - Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt, CN=USER - Subject Public Key Info: - Public Key Algorithm: rsa - RSA Public Key: (512 bit) - Modulus (512 bit): - 00:a8:a8:53:63:49:1b:93:c3:c3:0b:6c:88:11:55: - de:7e:6a:e2:f9:52:a0:dc:69:25:c4:c8:bf:55:e1: - 31:a8:ce:e4:a9:29:85:99:8a:15:9a:de:f6:2f:e1: - b4:50:5f:5e:04:75:a6:f4:76:dc:3c:0e:39:dc:3a: - be:3e:a4:61:8b - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Authority Key Identifier: - 0...~r..:..B.44fu......3 - X509v3 Subject Key Identifier: - ...... .*...1.*....... - X509v3 Key Usage: critical - .... - X509v3 Certificate Policies: critical - 0.0...*...0....... - X509v3 Subject Alternative Name: - 0:..user@darmstadt.gmd.de.!http://www.darmstadt.gmd.de/~user - X509v3 Issuer Alternative Name: - 0....gmdca@gmd.de..http://www.gmd.de..saturn.darmstadt.gmd.de.\1!0...U. -..European ICE-TEL project1#0!..U....V3-Certification Authority1.0...U....Darmstadt..141.12.62.26 - X509v3 Basic Constraints: critical - 0. - X509v3 CRL Distribution Points: - 0.0.......gmdca@gmd.de - Signature Algorithm: md5WithRSAEncryption - 69:0c:e1:b7:a7:f2:d8:fb:e8:69:c0:13:cd:37:ad:21:06:22: - 4d:e8:c6:db:f1:04:0b:b7:e0:b3:d6:0c:81:03:ce:c3:6a:3e: - c7:e7:24:24:a4:92:64:c2:83:83:06:42:53:0e:6f:09:1e:84: - 9a:f7:6f:63:9b:94:99:83:d6:a4 ------BEGIN CERTIFICATE----- -MIIDTzCCAvmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBcMSEwHwYDVQQKExhFdXJv -cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g -QXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHQwHhcNOTcwNDAyMTczNTU5WhcN -OTgwNDAyMTczNTU5WjBrMSEwHwYDVQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2pl -Y3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQH -EwlEYXJtc3RhZHQxDTALBgNVBAMTBFVTRVIwWTAKBgRVCAEBAgICAANLADBIAkEA -qKhTY0kbk8PDC2yIEVXefmri+VKg3GklxMi/VeExqM7kqSmFmYoVmt72L+G0UF9e -BHWm9HbcPA453Dq+PqRhiwIDAQABo4IBmDCCAZQwHwYDVR0jBBgwFoAUfnLy+DqG -nEKINDRmdcPU/NGiETMwHQYDVR0OBBYEFJfc4B8gjSoRmLUx4Sq/ucIYiMrPMA4G -A1UdDwEB/wQEAwIB8DAcBgNVHSABAf8EEjAQMAYGBCoDBAUwBgYECQgHBjBDBgNV -HREEPDA6gRV1c2VyQGRhcm1zdGFkdC5nbWQuZGWGIWh0dHA6Ly93d3cuZGFybXN0 -YWR0LmdtZC5kZS9+dXNlcjCBsQYDVR0SBIGpMIGmgQxnbWRjYUBnbWQuZGWGEWh0 -dHA6Ly93d3cuZ21kLmRlghdzYXR1cm4uZGFybXN0YWR0LmdtZC5kZaRcMSEwHwYD -VQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRp -ZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHSHDDE0MS4xMi42 -Mi4yNjAMBgNVHRMBAf8EAjAAMB0GA1UdHwQWMBQwEqAQoA6BDGdtZGNhQGdtZC5k -ZTANBgkqhkiG9w0BAQQFAANBAGkM4ben8tj76GnAE803rSEGIk3oxtvxBAu34LPW -DIEDzsNqPsfnJCSkkmTCg4MGQlMObwkehJr3b2OblJmD1qQ= ------END CERTIFICATE----- diff --git a/certs/ICE.crl b/certs/ICE.crl deleted file mode 100644 index 21939e8cc..000000000 --- a/certs/ICE.crl +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN X509 CRL----- -MIIBNDCBnjANBgkqhkiG9w0BAQIFADBFMSEwHwYDVQQKExhFdXJvcGVhbiBJQ0Ut -VEVMIFByb2plY3QxIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05 -NzA2MDkxNDQyNDNaFw05NzA3MDkxNDQyNDNaMCgwEgIBChcNOTcwMzAzMTQ0MjU0 -WjASAgEJFw05NjEwMDIxMjI5MjdaMA0GCSqGSIb3DQEBAgUAA4GBAH4vgWo2Tej/ -i7kbiw4Imd30If91iosjClNpBFwvwUDBclPEeMuYimHbLOk4H8Nofc0fw11+U/IO -KSNouUDcqG7B64oY7c4SXKn+i1MWOb5OJiWeodX3TehHjBlyWzoNMWCnYA8XqFP1 -mOKp8Jla1BibEZf14+/HqCi2hnZUiEXh ------END X509 CRL----- diff --git a/certs/ca-cert.pem b/certs/demo/ca-cert.pem similarity index 100% rename from certs/ca-cert.pem rename to certs/demo/ca-cert.pem diff --git a/certs/dsa-ca.pem b/certs/demo/dsa-ca.pem similarity index 100% rename from certs/dsa-ca.pem rename to certs/demo/dsa-ca.pem diff --git a/certs/dsa-pca.pem b/certs/demo/dsa-pca.pem similarity index 100% rename from certs/dsa-pca.pem rename to certs/demo/dsa-pca.pem diff --git a/certs/nortelCA.pem b/certs/demo/nortelCA.pem similarity index 100% rename from certs/nortelCA.pem rename to certs/demo/nortelCA.pem diff --git a/certs/pca-cert.pem b/certs/demo/pca-cert.pem similarity index 100% rename from certs/pca-cert.pem rename to certs/demo/pca-cert.pem diff --git a/certs/timCA.pem b/certs/demo/timCA.pem similarity index 100% rename from certs/timCA.pem rename to certs/demo/timCA.pem diff --git a/certs/tjhCA.pem b/certs/demo/tjhCA.pem similarity index 100% rename from certs/tjhCA.pem rename to certs/demo/tjhCA.pem diff --git a/certs/vsigntca.pem b/certs/demo/vsigntca.pem similarity index 100% rename from certs/vsigntca.pem rename to certs/demo/vsigntca.pem diff --git a/certs/RegTP-4R.pem b/certs/expired/RegTP-4R.pem similarity index 100% rename from certs/RegTP-4R.pem rename to certs/expired/RegTP-4R.pem diff --git a/certs/factory.pem b/certs/expired/factory.pem similarity index 100% rename from certs/factory.pem rename to certs/expired/factory.pem diff --git a/certs/rsa-cca.pem b/certs/expired/rsa-cca.pem similarity index 100% rename from certs/rsa-cca.pem rename to certs/expired/rsa-cca.pem diff --git a/certs/vsign2.pem b/certs/expired/vsign2.pem similarity index 100% rename from certs/vsign2.pem rename to certs/expired/vsign2.pem diff --git a/certs/wellsfgo.pem b/certs/wellsfgo.pem new file mode 100644 index 000000000..2ba88cdda --- /dev/null +++ b/certs/wellsfgo.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC +VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD +ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v +dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0 +MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww +KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G +A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13 +5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE +SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O +JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu +ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE +AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB +AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB +CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw +b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo +7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/ +0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7 +nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx +x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ +33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s= +-----END CERTIFICATE-----