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

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 4eacd13c21f7863d5183bc6da839f97156a222f8..e4c4c48669696c5c5304df2e95761b74f0f5837e 100644 (file)
--- 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 85d837bb7800101e7272c0a787779786098587fa..bd5a4e1fefa9f46973875739d142be8c5dd62152 100644 (file)
--- 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 66bc507681d7b329165522cea7f9cf6cb4eeda8b..81936507e8bf7808c85c3fab990280f57137df3e 100644 (file)
--- 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 3c788a8f8af50e512b83ce2d2a88b63b7cf83d47..8c204be2dd7fdc4ed5849f4fe64717203be0621d 100644 (file)
--- 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