"UID" is an incorrect lable for the attribute type uniqueIdentifier.

Furthermore, it create conflicts with LDAP and some RFCs that define
"UID" as a lable for the attribute type userId (which we haven't even
defined here).

The next question is if we should update objects.txt with the added
stuff from the main trunk.

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 512da31cae478f83973ce24657d57d9dd4cf0cc7..47c6b9a072e96a74c9c53e5d53b0273ee2ea6763 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -587,7 +587,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"G","givenName",NID_givenName,3,&(lvalues[535]),0},
 {"S","surname",NID_surname,3,&(lvalues[538]),0},
 {"I","initials",NID_initials,3,&(lvalues[541]),0},
-{"UID","uniqueIdentifier",NID_uniqueIdentifier,3,&(lvalues[544]),0},
+{"uniqueIdentifier","uniqueIdentifier",NID_uniqueIdentifier,3,
+       &(lvalues[544]),0},
 {"crlDistributionPoints","X509v3 CRL Distribution Points",
        NID_crl_distribution_points,3,&(lvalues[547]),0},
 {"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[550]),0},
@@ -1185,7 +1186,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[16]),/* "ST" */
 &(nid_objs[143]),/* "SXNetID" */
 &(nid_objs[106]),/* "T" */
-&(nid_objs[102]),/* "UID" */
 &(nid_objs[ 0]),/* "UNDEF" */
 &(nid_objs[11]),/* "X500" */
 &(nid_objs[378]),/* "X500algorithms" */
@@ -1474,6 +1474,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[293]),/* "textNotice" */
 &(nid_objs[133]),/* "timeStamping" */
 &(nid_objs[375]),/* "trustRoot" */
+&(nid_objs[102]),/* "uniqueIdentifier" */
 &(nid_objs[55]),/* "unstructuredAddress" */
 &(nid_objs[49]),/* "unstructuredName" */
 &(nid_objs[373]),/* "valid" */

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 57d0bbfbed120dbeae50ffa89d9032bc1e4332cf..ad2e4239e1255a2c02bea2488caa178e64eea1cc 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1574,7 +1574,6 @@
 #define NID_initials           101
 #define OBJ_initials           OBJ_X509,43L
 
-#define SN_uniqueIdentifier            "UID"
 #define LN_uniqueIdentifier            "uniqueIdentifier"
 #define NID_uniqueIdentifier           102
 #define OBJ_uniqueIdentifier           OBJ_X509,45L

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 5741ef5fc421fc2ea92e69830d3c2c4bd8355b6e..5f179a5f4cf7eb9eb86e412da8dfd7e3a235cdc7 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -508,7 +508,7 @@ X509 13                     : D                     : description
 X509 41                        : name                  : name
 X509 42                        : G                     : givenName
 X509 43                        : I                     : initials
-X509 45                        : UID                   : uniqueIdentifier
+X509 45                        :                       : uniqueIdentifier
 X509 46                        : dnQualifier           : dnQualifier
 X509 72                        : role                  : role