X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fobjects%2Fobjects.txt;h=d4ee20db37710808d6902127cc982757270c3ec7;hp=b539beb4a9bc1d5cfeb77d0ef19212b1f742652c;hb=f1a6a0d4ddbeb9470d2b03e447466997729c2aac;hpb=15c2e1260bb735575f93bfbf051908f51e21e6b3

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b539beb4a9..d4ee20db37 100644
--- 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 ?
@@ -432,7 +434,7 @@ id-pkix-OCSP 1		: basicOCSPResponse	: Basic OCSP Response
 id-pkix-OCSP 2		: Nonce			: OCSP Nonce
 id-pkix-OCSP 3		: CrlID			: OCSP CRL ID
 id-pkix-OCSP 4		: acceptableResponses	: Acceptable OCSP Responses
-id-pkix-OCSP 5		: noCheck
+id-pkix-OCSP 5		: noCheck		: OCSP No Check
 id-pkix-OCSP 6		: archiveCutoff		: OCSP Archive Cutoff
 id-pkix-OCSP 7		: serviceLocator	: OCSP Service Locator
 id-pkix-OCSP 8		: extendedStatus	: Extended OCSP Status
@@ -559,8 +561,43 @@ 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
+
+# Rijndael
+			: RIJNDAEL-ECB-K128-B128: rijndael-ecb-k128-b128
+			: RIJNDAEL-ECB-K192-B128: rijndael-ecb-k192-b128
+			: RIJNDAEL-ECB-K256-B128: rijndael-ecb-k256-b128
+			: RIJNDAEL-ECB-K128-B192: rijndael-ecb-k128-b192
+			: RIJNDAEL-ECB-K192-B192: rijndael-ecb-k192-b192
+			: RIJNDAEL-ECB-K256-B192: rijndael-ecb-k256-b192
+			: RIJNDAEL-ECB-K128-B256: rijndael-ecb-k128-b256
+			: RIJNDAEL-ECB-K192-B256: rijndael-ecb-k192-b256
+			: RIJNDAEL-ECB-K256-B256: rijndael-ecb-k256-b256