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

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

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index e4c4c48669696c5c5304df2e95761b74f0f5837e..56e6d87422b691ea71ab10e02a8a0efead208d18 100644 (file)
--- 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 bd5a4e1fefa9f46973875739d142be8c5dd62152..990e18113accf27e184597279c9df03c634992b4 100644 (file)
--- 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 8c204be2dd7fdc4ed5849f4fe64717203be0621d..707999ef2cc9c9c2532633dec59157af1a144912 100644 (file)
--- 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