Added OIDs from RFC 2247, 1155, and a few from 1700

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 79a1ba0a6c85ed638f2d3a74d7b127abd2c44b8f..401b1e5a1bc25b4d05a5309e6e15c4d9bb4789c0 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1714,6 +1714,78 @@
 #define NID_ns_sgc             139
 #define OBJ_ns_sgc             OBJ_netscape,4L,1L
 
+#define SN_org         "ORG"
+#define LN_org         "org"
+#define NID_org                379
+#define OBJ_org                OBJ_iso,3L
+
+#define SN_dod         "DOD"
+#define LN_dod         "dod"
+#define NID_dod                380
+#define OBJ_dod                OBJ_org,6L
+
+#define SN_iana                "IANA"
+#define LN_iana                "iana"
+#define NID_iana               381
+#define OBJ_iana               OBJ_dod,1L
+
+#define OBJ_internet           OBJ_iana
+
+#define SN_Directory           "directory"
+#define LN_Directory           "Directory"
+#define NID_Directory          382
+#define OBJ_Directory          OBJ_internet,1L
+
+#define SN_Management          "mgmt"
+#define LN_Management          "Management"
+#define NID_Management         383
+#define OBJ_Management         OBJ_internet,2L
+
+#define SN_Experimental                "experimental"
+#define LN_Experimental                "Experimental"
+#define NID_Experimental               384
+#define OBJ_Experimental               OBJ_internet,3L
+
+#define SN_Private             "private"
+#define LN_Private             "Private"
+#define NID_Private            385
+#define OBJ_Private            OBJ_internet,4L
+
+#define SN_Security            "security"
+#define LN_Security            "Security"
+#define NID_Security           386
+#define OBJ_Security           OBJ_internet,5L
+
+#define SN_SNMPv2              "snmpv2"
+#define LN_SNMPv2              "SNMPv2"
+#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
+
+#define SN_Enterprises         "enterprises"
+#define LN_Enterprises         "Enterprises"
+#define NID_Enterprises                389
+#define OBJ_Enterprises                OBJ_private,1L
+
+#define SN_dcObject            "dcobject"
+#define LN_dcObject            "dcObject"
+#define NID_dcObject           390
+#define OBJ_dcObject           OBJ_enterprises,1466L,344L
+
+#define SN_domainComponent             "DC"
+#define LN_domainComponent             "domainComponent"
+#define NID_domainComponent            391
+#define OBJ_domainComponent            0L,9L,2342L,19200300L,100L,1L,25L
+
+#define SN_Domain              "domain"
+#define LN_Domain              "Domain"
+#define NID_Domain             392
+#define OBJ_Domain             0L,9L,2342L,19200300L,100L,4L,13L
+
 #define SN_rle_compression             "RLE"
 #define LN_rle_compression             "run length compression"
 #define NID_rle_compression            124

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index bf5639ba5f9a414a89764a6d3db6bef412ae4ded..d73a51370f76f72176351070464a56ff999cebbf 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -376,3 +376,17 @@ id_pkix_OCSP_trustRoot             375
 algorithm              376
 rsaSignature           377
 X500algorithms         378
+org            379
+dod            380
+iana           381
+Directory              382
+Management             383
+Experimental           384
+Private                385
+Security               386
+SNMPv2         387
+Mail           388
+Enterprises            389
+dcObject               390
+domainComponent                391
+Domain         392

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b539beb4a9bc1d5cfeb77d0ef19212b1f742652c..3d443cf88479f4c182b5f484f3724351a0462e0d 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1,5 +1,7 @@
 1                      : ISO                   : iso
+
 iso 2                  : member-body           : ISO Member Body
+
 member-body 840                : ISO-US                : ISO US Member Body
 ISO-US 10040           : X9-57                 : X9.57
 X9-57 4                        : X9cm                  : X9.57 CM ?
@@ -559,8 +561,33 @@ netscape-data-type 5       : nsCertSequence        : Netscape Certificate Sequence
 !Cname ns-sgc
 netscape 4 1           : nsSGC                 : Netscape Server Gated Crypto
 
+# iso(1)
+iso 3                  : ORG                   : org
+org 6                  : DOD                   : dod
+dod 1                  : IANA                  : iana
+!Alias internet iana
+
+internet 1             : directory             : Directory
+internet 2             : mgmt                  : Management
+internet 3             : experimental          : Experimental
+internet 4             : private               : Private
+internet 5             : security              : Security
+internet 6             : snmpv2                : SNMPv2
+internet 7             : mail                  : Mail
+
+private 1              : enterprises           : Enterprises
+
+# RFC 2247
+enterprises 1466 344   : dcobject              : dcObject
+
+# Stray OIDs we don't know the full name of each step for
+# RFC 2247
+0 9 2342 19200300 100 1 25 : DC                        : domainComponent
+0 9 2342 19200300 100 4 13 : domain            : Domain
+
 # What the hell are these OIDs, really?
 !Cname rle-compression
 1 1 1 1 666 1          : RLE                   : run length compression
 !Cname zlib-compression
 1 1 1 1 666 2          : ZLIB                  : zlib compression
+