From 54d4f8c320e2dca21d8d7d67376f3d899ede7850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 13 Jan 2003 15:52:04 +0000
Subject: [PATCH] undo part of a recent change: it's "surname", not "surName"
 (see X.520 aka ISO/IEC 9594-6)

---
 crypto/objects/obj_dat.h   | 4 ++--
 crypto/objects/obj_mac.h   | 2 +-
 crypto/objects/objects.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index e4c4c48669..56e6d87422 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -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" */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index bd5a4e1fef..990e18113a 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -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
 
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8c204be2dd..707999ef2c 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -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