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

[openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 512fc9c9547cb8a339db99e3200b403acdeaff97..03f071c2c2f157a6e3c755a60e5068e8c7d805db 100644 (file)
--- 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