Use the "mail" short name according to RFC2798 (Michael Bell

<michael.bell@rz.hu-berlin.de>).

3 files changed, 12 insertions, 7 deletions

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 68f225b3d8..533b919ffe 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -1218,7 +1218,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"private","Private",NID_Private,4,&(lvalues[2844]),0},
 {"security","Security",NID_Security,4,&(lvalues[2848]),0},
 {"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2852]),0},
-{"mail","Mail",NID_Mail,4,&(lvalues[2856]),0},
+{"Mail","Mail",NID_Mail,4,&(lvalues[2856]),0},
 {"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2860]),0},
 {"dcobject","dcObject",NID_dcObject,9,&(lvalues[2865]),0},
 {"DC","domainComponent",NID_domainComponent,10,&(lvalues[2874]),0},
@@ -1318,7 +1318,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"UID","userId",NID_userId,10,&(lvalues[3393]),0},
 {"textEncodedORAddress","textEncodedORAddress",
 	NID_textEncodedORAddress,10,&(lvalues[3403]),0},
-{"rfc822Mailbox","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3413]),0},
+{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3413]),0},
 {"info","info",NID_info,10,&(lvalues[3423]),0},
 {"favouriteDrink","favouriteDrink",NID_favouriteDrink,10,
 	&(lvalues[3433]),0},
@@ -1530,6 +1530,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[ 4]),/* "MD5" */
 &(nid_objs[114]),/* "MD5-SHA1" */
 &(nid_objs[95]),/* "MDC2" */
+&(nid_objs[388]),/* "Mail" */
 &(nid_objs[57]),/* "Netscape" */
 &(nid_objs[366]),/* "Nonce" */
 &(nid_objs[17]),/* "O" */
@@ -1876,7 +1877,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[476]),/* "lastModifiedTime" */
 &(nid_objs[157]),/* "localKeyID" */
 &(nid_objs[480]),/* "mXRecord" */
-&(nid_objs[388]),/* "mail" */
+&(nid_objs[460]),/* "mail" */
 &(nid_objs[493]),/* "mailPreferenceOption" */
 &(nid_objs[467]),/* "manager" */
 &(nid_objs[182]),/* "member-body" */
@@ -1956,7 +1957,6 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[286]),/* "qcStatements" */
 &(nid_objs[457]),/* "qualityLabelledData" */
 &(nid_objs[450]),/* "rFC822localPart" */
-&(nid_objs[460]),/* "rfc822Mailbox" */
 &(nid_objs[400]),/* "role" */
 &(nid_objs[448]),/* "room" */
 &(nid_objs[463]),/* "roomNumber" */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index d995582739..bdc1b7f3b4 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -2132,7 +2132,6 @@
 #define NID_SNMPv2		387
 #define OBJ_SNMPv2		OBJ_internet,6L
 
-#define SN_Mail		"mail"
 #define LN_Mail		"Mail"
 #define NID_Mail		388
 #define OBJ_Mail		OBJ_internet,7L
@@ -2380,6 +2379,7 @@
 #define NID_textEncodedORAddress		459
 #define OBJ_textEncodedORAddress		OBJ_pilotAttributeType,2L
 
+#define SN_rfc822Mailbox		"mail"
 #define LN_rfc822Mailbox		"rfc822Mailbox"
 #define NID_rfc822Mailbox		460
 #define OBJ_rfc822Mailbox		OBJ_pilotAttributeType,3L
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 512fc9c954..03f071c2c2 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -695,7 +695,12 @@ internet 3		: experimental		: Experimental
 internet 4		: private		: Private
 internet 5		: security		: Security
 internet 6		: snmpv2		: SNMPv2
-internet 7		: mail			: Mail
+# Documents refer to "internet 7" as "mail". This however leads to ambiguities
+# with RFC2798, Section 9.1.3, where "mail" is defined as the short name for
+# rfc822Mailbox. The short name is therefore here left out for a reason.
+# Subclasses of "mail", e.g. "MIME MHS" don't consitute a problem, as
+# references are realized via long name "Mail" (with capital M).
+internet 7		:			: Mail
 
 Private 1		: enterprises		: Enterprises
 
@@ -782,7 +787,7 @@ pilotObjectClass 21	:			: pilotDSA
 pilotObjectClass 22	:			: qualityLabelledData
 pilotAttributeType 1	: UID			: userId
 pilotAttributeType 2	:			: textEncodedORAddress
-pilotAttributeType 3	:			: rfc822Mailbox
+pilotAttributeType 3	: mail			: rfc822Mailbox
 pilotAttributeType 4	: info
 pilotAttributeType 5	:			: favouriteDrink
 pilotAttributeType 6	:			: roomNumber