Commit 4b16376d authored by Richard Levitte's avatar Richard Levitte
Browse files

"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.
parent fe094cdf

crypto/objects/obj_dat.h

+3 −2
Original line number Diff line number Diff line
@@ -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" */

crypto/objects/obj_mac.h

+0 −1
Original line number Diff line number Diff line
@@ -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

crypto/objects/objects.txt

+1 −1
Original line number Diff line number Diff line
@@ -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