Commit 2ef9e7ef authored by Richard Levitte's avatar Richard Levitte
Browse files

Keep the internal lowercase 'surname', for programmer's sake.

parent 449598e7

crypto/objects/obj_dat.h

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static unsigned char lvalues[4455]={ 
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 */
@@ -827,7 +827,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ 
{"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},

{"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",
@@ -3041,7 +3041,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ 
&(nid_objs[381]),/* OBJ_iana                         1 3 6 1 */

&(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 */

crypto/objects/obj_mac.h

+4 −4
Original line number Diff line number Diff line
@@ -1595,10 +1595,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

crypto/objects/obj_mac.num

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/objects/objects.txt

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ algorithm 29 : RSA-SHA1-2 : sha1WithRSA 


X500 4			: X509

X509 3			: CN			: commonName

!Cname surname

X509 4			: SN			: surName

X509 5			: 			: serialNumber

X509 6			: C			: countryName