Commit 54d4f8c3 authored by Bodo Möller's avatar Bodo Möller
Browse files

undo part of a recent change: it's "surname", not "surName" 

(see X.520 aka ISO/IEC 9594-6)
parent c76153f3

crypto/objects/obj_dat.h

+2 −2
Original line number Diff line number Diff line
@@ -897,7 +897,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",
@@ -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" */

crypto/objects/obj_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -1880,7 +1880,7 @@ 
#define OBJ_commonName		OBJ_X509,3L



#define SN_surname		"SN"

#define LN_surname		"surName"

#define LN_surname		"surname"

#define NID_surname		100

#define OBJ_surname		OBJ_X509,4L

crypto/objects/objects.txt

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ algorithm 29 : RSA-SHA1-2 : sha1WithRSA 
X500 4			: X509

X509 3			: CN			: commonName

!Cname surname

X509 4			: SN			: surName

X509 4			: SN			: surname

X509 5			: 			: serialNumber

X509 6			: C			: countryName

X509 7			: L			: localityName