From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Dec 2002 09:39:34 +0000 (+0000)
Subject: Keep the internal lowercase 'surname', for programmer's sake.
X-Git-Tag: OpenSSL_0_9_7a~86^2~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9ecb1edd88ab5fa51c2a61a5559280872f0aa3c;p=oweals%2Fopenssl.git

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

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 4eacd13c21..e4c4c48669 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 */
@@ -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",
@@ -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 85d837bb78..bd5a4e1fef 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
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 66bc507681..81936507e8 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
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 3c788a8f8a..8c204be2dd 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -610,6 +610,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