Some more OID enhancements.

CHANGES

@@ -41,8 +41,8 @@
  Changes between 0.9.6d and 0.9.7  [XX xxx 2002]
 
   *) Make object definitions compliant to LDAP (RFC2256): SN is the short
-     form for "surname", serialNumber has no short form (Michael Bell
-     <michael.bell@rz.hu-berlin.de>).
+     form for "surname", serialNumber has no short form; some more OID
+     additions.(Michael Bell <michael.bell@rz.hu-berlin.de>)
      [Lutz Jaenicke]
 
   *) Add an "init" command to the ENGINE config module and auto initialize

crypto/objects/obj_mac.h

@@ -583,7 +583,6 @@
 #define NID_pkcs9		47
 #define OBJ_pkcs9		OBJ_pkcs,9L
 
-#define SN_pkcs9_emailAddress		"Email"
 #define LN_pkcs9_emailAddress		"emailAddress"
 #define NID_pkcs9_emailAddress		48
 #define OBJ_pkcs9_emailAddress		OBJ_pkcs9,1L
@@ -1876,12 +1875,10 @@
 #define NID_organizationalUnitName		18
 #define OBJ_organizationalUnitName		OBJ_X509,11L
 
-#define SN_title		"T"
 #define LN_title		"title"
 #define NID_title		106
 #define OBJ_title		OBJ_X509,12L
 
-#define SN_description		"D"
 #define LN_description		"description"
 #define NID_description		107
 #define OBJ_description		OBJ_X509,13L
@@ -1891,19 +1888,18 @@
 #define NID_name		173
 #define OBJ_name		OBJ_X509,41L
 
-#define SN_givenName		"G"
+#define SN_givenName		"gn"
 #define LN_givenName		"givenName"
 #define NID_givenName		99
 #define OBJ_givenName		OBJ_X509,42L
 
-#define SN_initials		"I"
 #define LN_initials		"initials"
 #define NID_initials		101
 #define OBJ_initials		OBJ_X509,43L
 
-#define LN_uniqueIdentifier		"uniqueIdentifier"
-#define NID_uniqueIdentifier		102
-#define OBJ_uniqueIdentifier		OBJ_X509,45L
+#define LN_x500UniqueIdentifier		"x500UniqueIdentifier"
+#define NID_x500UniqueIdentifier		568
+#define OBJ_x500UniqueIdentifier		OBJ_X509,45L
 
 #define SN_dnQualifier		"dnQualifier"
 #define LN_dnQualifier		"dnQualifier"
@@ -2151,6 +2147,31 @@
 #define NID_dcObject		390
 #define OBJ_dcObject		OBJ_Enterprises,1466L,344L
 
+#define SN_mime_mhs		"mime-mhs"
+#define LN_mime_mhs		"MIME MHS"
+#define NID_mime_mhs		569
+#define OBJ_mime_mhs		OBJ_Mail,1L
+
+#define SN_mime_mhs_headings		"mime-mhs-headings"
+#define LN_mime_mhs_headings		"mime-mhs-headings"
+#define NID_mime_mhs_headings		570
+#define OBJ_mime_mhs_headings		OBJ_mime_mhs,1L
+
+#define SN_mime_mhs_bodies		"mime-mhs-bodies"
+#define LN_mime_mhs_bodies		"mime-mhs-bodies"
+#define NID_mime_mhs_bodies		571
+#define OBJ_mime_mhs_bodies		OBJ_mime_mhs,2L
+
+#define SN_id_hex_partial_message		"id-hex-partial-message"
+#define LN_id_hex_partial_message		"id-hex-partial-message"
+#define NID_id_hex_partial_message		572
+#define OBJ_id_hex_partial_message		OBJ_mime_mhs_headings,1L
+
+#define SN_id_hex_multipart_message		"id-hex-multipart-message"
+#define LN_id_hex_multipart_message		"id-hex-multipart-message"
+#define NID_id_hex_multipart_message		573
+#define OBJ_id_hex_multipart_message		OBJ_mime_mhs_headings,2L
+
 #define SN_rle_compression		"RLE"
 #define LN_rle_compression		"run length compression"
 #define NID_rle_compression		124

crypto/objects/obj_mac.num

@@ -565,3 +565,9 @@ wap_wsg_idm_ecid_wtls1		564
 wap_wsg_idm_ecid_wtls6		565
 wap_wsg_idm_ecid_wtls8		566
 wap_wsg_idm_ecid_wtls9		567
+x500UniqueIdentifier		568
+mime_mhs		569
+mime_mhs_headings		570
+mime_mhs_bodies		571
+id_hex_partial_message		572
+id_hex_multipart_message		573

crypto/objects/objects.txt

@@ -168,7 +168,7 @@ pkcs7 6			:			: pkcs7-encryptedData
 
 pkcs 9			: pkcs9
 !module pkcs9
-pkcs9 1			: Email			: emailAddress
+pkcs9 1			: 			: emailAddress
 pkcs9 2			:			: unstructuredName
 pkcs9 3			:			: contentType
 pkcs9 4			:			: messageDigest
@@ -606,12 +606,12 @@ X509 7			: L			: localityName
 X509 8			: ST			: stateOrProvinceName
 X509 10			: O			: organizationName
 X509 11			: OU			: organizationalUnitName
-X509 12			: T			: title
-X509 13			: D			: description
+X509 12			: 			: title
+X509 13			: 			: description
 X509 41			: name			: name
-X509 42			: G			: givenName
-X509 43			: I			: initials
-X509 45			: 			: uniqueIdentifier
+X509 42			: gn			: givenName
+X509 43			: 			: initials
+X509 45			: 			: x500UniqueIdentifier
 X509 46			: dnQualifier		: dnQualifier
 X509 72			: role			: role
 
@@ -702,6 +702,13 @@ Private 1		: enterprises		: Enterprises
 # RFC 2247
 Enterprises 1466 344	: dcobject		: dcObject
 
+# RFC 1495
+Mail 1			: mime-mhs		: MIME MHS
+mime-mhs 1		: mime-mhs-headings	: mime-mhs-headings
+mime-mhs 2		: mime-mhs-bodies	: mime-mhs-bodies
+mime-mhs-headings 1	: id-hex-partial-message : id-hex-partial-message
+mime-mhs-headings 2	: id-hex-multipart-message : id-hex-multipart-message
+
 # What the hell are these OIDs, really?
 !Cname rle-compression
 1 1 1 1 666 1		: RLE			: run length compression