From 8baf5fdca094a1d93b43e3b530e3b96eaf482941 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 20 Dec 2002 09:24:17 +0000 Subject: [PATCH] Be consistent with capitalisation of object names. --- crypto/objects/obj_dat.h | 12 ++++++------ crypto/objects/obj_mac.h | 10 +++++----- crypto/objects/obj_mac.num | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index c9ce8dc56e..4eacd13c21 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -150,7 +150,7 @@ static unsigned char lvalues[4869]={ 0x55,0x08,0x03,0x65, /* [527] OBJ_mdc2 */ 0x55,0x08,0x03,0x64, /* [531] OBJ_mdc2WithRSA */ 0x55,0x04,0x2A, /* [535] OBJ_givenName */ -0x55,0x04,0x04, /* [538] OBJ_surname */ +0x55,0x04,0x04, /* [538] OBJ_surName */ 0x55,0x04,0x2B, /* [541] OBJ_initials */ 0x55,0x1D,0x1F, /* [544] OBJ_crl_distribution_points */ 0x2B,0x0E,0x03,0x02,0x03, /* [547] OBJ_md5WithRSA */ @@ -896,8 +896,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[531]),0}, {"RC4-40","rc4-40",NID_rc4_40,0,NULL}, {"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL}, -{"gn","givenName",NID_givenName,3,&(lvalues[535]),0}, -{"SN","surname",NID_surname,3,&(lvalues[538]),0}, +{"GN","givenName",NID_givenName,3,&(lvalues[535]),0}, +{"SN","surName",NID_surName,3,&(lvalues[538]),0}, {"initials","initials",NID_initials,3,&(lvalues[541]),0}, {NULL,NULL,NID_undef,0,NULL}, {"crlDistributionPoints","X509v3 CRL Distribution Points", @@ -1931,6 +1931,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[70]),/* "DSA-SHA1-old" */ &(nid_objs[67]),/* "DSA-old" */ &(nid_objs[297]),/* "DVCS" */ +&(nid_objs[99]),/* "GN" */ &(nid_objs[381]),/* "IANA" */ &(nid_objs[34]),/* "IDEA-CBC" */ &(nid_objs[35]),/* "IDEA-CFB" */ @@ -2098,7 +2099,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[490]),/* "friendlyCountryName" */ &(nid_objs[156]),/* "friendlyName" */ &(nid_objs[574]),/* "generationQualifier" */ -&(nid_objs[99]),/* "gn" */ &(nid_objs[163]),/* "hmacWithSHA1" */ &(nid_objs[432]),/* "holdInstructionCallIssuer" */ &(nid_objs[430]),/* "holdInstructionCode" */ @@ -3282,7 +3282,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[16]),/* "stateOrProvinceName" */ &(nid_objs[498]),/* "subtreeMaximumQuality" */ &(nid_objs[497]),/* "subtreeMinimumQuality" */ -&(nid_objs[100]),/* "surname" */ +&(nid_objs[100]),/* "surName" */ &(nid_objs[459]),/* "textEncodedORAddress" */ &(nid_objs[293]),/* "textNotice" */ &(nid_objs[106]),/* "title" */ @@ -3335,7 +3335,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[528]),/* 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 */ +&(nid_objs[100]),/* OBJ_surName 2 5 4 4 */ &(nid_objs[105]),/* OBJ_serialNumber 2 5 4 5 */ &(nid_objs[14]),/* OBJ_countryName 2 5 4 6 */ &(nid_objs[15]),/* OBJ_localityName 2 5 4 7 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 705359675b..85d837bb78 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -1879,10 +1879,10 @@ #define NID_commonName 13 #define OBJ_commonName OBJ_X509,3L -#define SN_surname "SN" -#define LN_surname "surname" -#define NID_surname 100 -#define OBJ_surname OBJ_X509,4L +#define SN_surName "SN" +#define LN_surName "surName" +#define NID_surName 100 +#define OBJ_surName OBJ_X509,4L #define LN_serialNumber "serialNumber" #define NID_serialNumber 105 @@ -1926,7 +1926,7 @@ #define NID_name 173 #define OBJ_name OBJ_X509,41L -#define SN_givenName "gn" +#define SN_givenName "GN" #define LN_givenName "givenName" #define NID_givenName 99 #define OBJ_givenName OBJ_X509,42L diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 81936507e8..66bc507681 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -98,7 +98,7 @@ mdc2WithRSA 96 rc4_40 97 rc2_40_cbc 98 givenName 99 -surname 100 +surName 100 initials 101 uniqueIdentifier 102 crl_distribution_points 103 -- 2.25.1