Rijdael CBC mode and partial undebugged SSL support.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index e56f2d24c35c4c1989162a4524105eb040f66f5a..d110ad6c6512d4a86ec5440bcfdaa55c71f268d6 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 ?
@@ -320,8 +322,7 @@ id-kp 6                     : ipsecTunnel           : IPSec Tunnel
 id-kp 7                        : ipsecUser             : IPSec User
 !Cname time-stamp
 id-kp 8                        : timeStamping          : Time Stamping
-#??? According to PKIX, id-kp 9 is temporalDataAuthority
-#??? I've no idea where OCSP-sign comes from -- Richard Levitte
+# From OCSP spec RFC2560
 !Cname OCSP-sign
 id-kp 9                        : OCSPSigning           : OCSP Signing
 id-kp 10               : DVCS                  : dvcs
@@ -421,9 +422,9 @@ id-ad 1                     : OCSP                  : OCSP
 !Cname ad-ca-issuers
 id-ad 2                        : caIssuers             : CA Issuers
 !Cname ad-timeStamping
-id-ad 3                        : timestamping          : Time Stamping
+id-ad 3                        : ad_timestamping       : AD Time Stamping
 !Cname ad-dvcs
-id-ad 4                        : DVCS                  : dvcs
+id-ad 4                        : AD_DVCS               : ad dvcs
 
 
 !Alias id-pkix-OCSP ad-OCSP
@@ -433,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
@@ -560,8 +561,52 @@ 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
+                       : RD128-CBC-B128        : rd128-cbc-b128
+                       : RD192-CBC-B128        : rd192-cbc-b128
+                       : RD256-CBC-B128        : rd256-cbc-b128
+                       : RD128-CBC-B192        : rd128-cbc-b192
+                       : RD192-CBC-B192        : rd192-cbc-b192
+                       : RD256-CBC-B192        : rd256-cbc-b192
+                       : RD128-CBC-B256        : rd128-cbc-b256
+                       : RD192-CBC-B256        : rd192-cbc-b256
+                       : RD256-CBC-B256        : rd256-cbc-b256