RT937: Enable pilotAttributeType uniqueIdentifier

Reviewed-by: N Richard Levitte <levitte@openssl.org>

RT937: Enable pilotAttributeType uniqueIdentifier
Reviewed-by: N Richard Levitte <levitte@openssl.org>
c81f425e · Rich Salz · 2b8f33a5 · c81f425e · c81f425e · c81f425e
隐藏空白更改
内联并排

Showing with 1641 addition and 1633 deletion

crypto/objects/obj_dat.h crypto/objects/obj_dat.h +1635 -1631

crypto/objects/obj_mac.h crypto/objects/obj_mac.h +5 -0

crypto/objects/objects.txt crypto/objects/objects.txt +1 -2

未找到文件。
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -3075,6 +3075,11 @@
 #define NID_friendlyCountryName         490
 #define OBJ_friendlyCountryName         OBJ_pilotAttributeType,43L

+#define SN_uniqueIdentifier             "uid"
+#define LN_uniqueIdentifier             "uniqueIdentifier"
+#define NID_uniqueIdentifier            102
+#define OBJ_uniqueIdentifier            OBJ_pilotAttributeType,44L
+
 #define LN_organizationalStatus         "organizationalStatus"
 #define NID_organizationalStatus                491
 #define OBJ_organizationalStatus                OBJ_pilotAttributeType,45L

--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -988,8 +988,7 @@ pilotAttributeType 40	:			: personalTitle
 pilotAttributeType 41	:			: mobileTelephoneNumber
 pilotAttributeType 42	:			: pagerTelephoneNumber
 pilotAttributeType 43	:			: friendlyCountryName
-# The following clashes with 2.5.4.45, so commented away
-#pilotAttributeType 44	: uid			: uniqueIdentifier
+pilotAttributeType 44	: uid			: uniqueIdentifier
 pilotAttributeType 45	:			: organizationalStatus
 pilotAttributeType 46	:			: janetMailbox
 pilotAttributeType 47	:			: mailPreferenceOption