From 2e1366366e9f12b7fb72b32289a64fe1a53457c4 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 1 Dec 2004 17:55:07 +0000 Subject: [PATCH] Add two OIDs, make update --- crypto/objects/obj_dat.h | 20 +++++++++++++++----- crypto/objects/obj_mac.h | 8 ++++++++ crypto/objects/obj_mac.num | 2 ++ crypto/objects/objects.txt | 2 ++ util/libeay.num | 1 + 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 9de7b1217e..ae50a72b9a 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 660 -#define NUM_SN 653 -#define NUM_LN 653 -#define NUM_OBJ 617 +#define NUM_NID 662 +#define NUM_SN 655 +#define NUM_LN 655 +#define NUM_OBJ 619 -static unsigned char lvalues[4455]={ +static unsigned char lvalues[4461]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -685,6 +685,8 @@ static unsigned char lvalues[4455]={ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4425] OBJ_rsaOAEPEncryptionSET */ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4434] OBJ_ms_smartcard_login */ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4444] OBJ_ms_upn */ +0x55,0x04,0x09, /* [4454] OBJ_streetAddress */ +0x55,0x04,0x11, /* [4457] OBJ_postalCode */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -1738,6 +1740,8 @@ 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}, +{"streetAddress","streetAddress",NID_streetAddress,3,&(lvalues[4454]),0}, +{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4457]),0}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ @@ -2206,6 +2210,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ &(nid_objs[47]),/* "pkcs9" */ &(nid_objs[401]),/* "policyConstraints" */ +&(nid_objs[661]),/* "postalCode" */ &(nid_objs[406]),/* "prime-field" */ &(nid_objs[409]),/* "prime192v1" */ &(nid_objs[410]),/* "prime192v2" */ @@ -2375,6 +2380,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(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" */ @@ -2861,6 +2867,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[22]),/* "pkcs7-signedData" */ &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ &(nid_objs[47]),/* "pkcs9" */ +&(nid_objs[661]),/* "postalCode" */ &(nid_objs[406]),/* "prime-field" */ &(nid_objs[409]),/* "prime192v1" */ &(nid_objs[410]),/* "prime192v2" */ @@ -3033,6 +3040,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(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" */ @@ -3076,10 +3084,12 @@ 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 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index ceeaaa391d..b1a3c8a857 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -1619,6 +1619,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 @@ -1637,6 +1641,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 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 4dffeaed22..f808d96442 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -657,3 +657,5 @@ des_cfb1 656 des_cfb8 657 des_ede3_cfb1 658 des_ede3_cfb8 659 +streetAddress 660 +postalCode 661 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index cd315d0cc0..10d811c377 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -536,10 +536,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 diff --git a/util/libeay.num b/util/libeay.num index d446b9e5e9..c9d1f95614 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2841,3 +2841,4 @@ FIPS_md5_allowed 3282 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_mode 3283 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_selftest_failed 3284 EXIST:OPENSSL_FIPS:FUNCTION: sk_is_sorted 3285 EXIST::FUNCTION: +X509_check_ca 3286 EXIST::FUNCTION: -- 2.25.1