UID was never a lable for uniqueIdentifier. However, LDAP and certain

RFCs concerning X.500 directories use UID as a shorter name for the
attribute type userId, which is defined by CCITT and available through
RFCs 1274 and 2247.

Unfortunately, if some applications have used the name "UID" for the
uniqueIdentifier attribute type, they will produce incorrect results.
However, I found it better to follow the standards that are out there
rather than having our own incompatible one.

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index ca21f5a14886d9bb6e6639b1224ea07c014b1027..630aa63c2acffada4c6cdbfd473cc65a6720e13c 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -498,7 +498,7 @@ static unsigned char lvalues[3837]={
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3356] OBJ_pilotOrganization */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3366] OBJ_pilotDSA */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3376] OBJ_qualityLabelledData */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3386] OBJ_userid */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3386] OBJ_userId */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3396] OBJ_textEncodedORAddress */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3406] OBJ_rfc822Mailbox */
 0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3416] OBJ_info */
@@ -686,7 +686,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},
@@ -1246,7 +1247,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3366]),0},
 {"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData,
        10,&(lvalues[3376]),0},
-{"userid","userid",NID_userid,10,&(lvalues[3386]),0},
+{"UID","userId",NID_userId,10,&(lvalues[3386]),0},
 {"textEncodedORAddress","textEncodedORAddress",
        NID_textEncodedORAddress,10,&(lvalues[3396]),0},
 {"rfc822Mailbox","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3406]),0},
@@ -1439,7 +1440,7 @@ 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[458]),/* "UID" */
 &(nid_objs[ 0]),/* "UNDEF" */
 &(nid_objs[11]),/* "X500" */
 &(nid_objs[378]),/* "X500algorithms" */
@@ -1811,10 +1812,10 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[133]),/* "timeStamping" */
 &(nid_objs[375]),/* "trustRoot" */
 &(nid_objs[436]),/* "ucl" */
+&(nid_objs[102]),/* "uniqueIdentifier" */
 &(nid_objs[55]),/* "unstructuredAddress" */
 &(nid_objs[49]),/* "unstructuredName" */
 &(nid_objs[465]),/* "userClass" */
-&(nid_objs[458]),/* "userid" */
 &(nid_objs[373]),/* "valid" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@@ -2317,7 +2318,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[55]),/* "unstructuredAddress" */
 &(nid_objs[49]),/* "unstructuredName" */
 &(nid_objs[465]),/* "userClass" */
-&(nid_objs[458]),/* "userid" */
+&(nid_objs[458]),/* "userId" */
 &(nid_objs[373]),/* "valid" */
 &(nid_objs[158]),/* "x509Certificate" */
 &(nid_objs[160]),/* "x509Crl" */
@@ -2647,7 +2648,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
 &(nid_objs[78]),/* OBJ_netscape_comment             2 16 840 1 113730 1 13 */
 &(nid_objs[79]),/* OBJ_netscape_cert_sequence       2 16 840 1 113730 2 5 */
 &(nid_objs[139]),/* OBJ_ns_sgc                       2 16 840 1 113730 4 1 */
-&(nid_objs[458]),/* OBJ_userid                       0 9 2342 19200300 100 1 1 */
+&(nid_objs[458]),/* OBJ_userId                       0 9 2342 19200300 100 1 1 */
 &(nid_objs[459]),/* OBJ_textEncodedORAddress         0 9 2342 19200300 100 1 2 */
 &(nid_objs[460]),/* OBJ_rfc822Mailbox                0 9 2342 19200300 100 1 3 */
 &(nid_objs[461]),/* OBJ_info                         0 9 2342 19200300 100 1 4 */

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index ee121e7c418d29542fb3b3a3fb1ab8407c093e07..a6fb0a1cd543c95a9d80ee408731177033dd86d4 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1646,7 +1646,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
@@ -2096,9 +2095,10 @@
 #define NID_qualityLabelledData                457
 #define OBJ_qualityLabelledData                OBJ_pilotObjectClass,22L
 
-#define SN_userid              "userid"
-#define NID_userid             458
-#define OBJ_userid             OBJ_pilotAttributeType,1L
+#define SN_userId              "UID"
+#define LN_userId              "userId"
+#define NID_userId             458
+#define OBJ_userId             OBJ_pilotAttributeType,1L
 
 #define LN_textEncodedORAddress                "textEncodedORAddress"
 #define NID_textEncodedORAddress               459

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 347cbac2f89b55b311d046453d9aaa2f67fe7c88..63b75951ac531bb131b3dd7919210d2df2c92893 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -455,7 +455,7 @@ simpleSecurityObject                454
 pilotOrganization              455
 pilotDSA               456
 qualityLabelledData            457
-userid         458
+userId         458
 textEncodedORAddress           459
 rfc822Mailbox          460
 info           461

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 254004608a091261758cdcbcc42b7e98b6e91885..5260da4f4cdbb3e3b9cc30abb37dd033a6126e36 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -539,7 +539,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
 
@@ -695,7 +695,7 @@ pilotObjectClass 19 :                       : simpleSecurityObject
 pilotObjectClass 20    :                       : pilotOrganization
 pilotObjectClass 21    :                       : pilotDSA
 pilotObjectClass 22    :                       : qualityLabelledData
-pilotAttributeType 1   : userid
+pilotAttributeType 1   : UID                   : userId
 pilotAttributeType 2   :                       : textEncodedORAddress
 pilotAttributeType 3   :                       : rfc822Mailbox
 pilotAttributeType 4   : info