From 4b16376d515493eae66f23bd9fafc93d33d3e478 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 4 Dec 2001 11:10:54 +0000 Subject: [PATCH] "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. --- crypto/objects/obj_dat.h | 5 +++-- crypto/objects/obj_mac.h | 1 - crypto/objects/objects.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 512da31cae..47c6b9a072 100644 --- 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 57d0bbfbed..ad2e4239e1 100644 --- 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 5741ef5fc4..5f179a5f4c 100644 --- 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 -- 2.25.1