Allow 32-bit perl to generate x86_64 assembler.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 46a405b3e64b134ff845d119b3995feef27cba1f..bbba5ed04b9164d8e99d1c71f8a0d6278f470259 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -11,6 +11,10 @@ iso 2                        : member-body           : ISO Member Body
 
 iso 3                  : identified-organization
 
+# HMAC OIDs
+identified-organization 6 1 5 5 8 1 1  : HMAC-MD5      : hmac-md5
+identified-organization 6 1 5 5 8 1 2  : HMAC-SHA1     : hmac-sha1
+
 identified-organization 132    : certicom-arc
 
 joint-iso-itu-t 23     : international-organizations   : International Organizations
@@ -141,6 +145,10 @@ ISO-US 113533 7 66 10      : CAST5-CBC             : cast5-cbc
 !Cname pbeWithMD5AndCast5-CBC
 ISO-US 113533 7 66 12  :                       : pbeWithMD5AndCast5CBC
 
+# Macs for CMP and CRMF
+ISO-US 113533 7 66 13  : id-PasswordBasedMAC   : password based MAC
+ISO-US 113533 7 66 30  : id-DHBasedMac         : Diffie-Hellman based MAC
+
 ISO-US 113549          : rsadsi                : RSA Data Security, Inc.
 
 rsadsi 1               : pkcs                  : RSA Data Security, Inc. PKCS
@@ -434,9 +442,9 @@ id-pe 3                     : qcStatements
 id-pe 4                        : ac-auditEntity
 id-pe 5                        : ac-targeting
 id-pe 6                        : aaControls
-id-pe 7                        : sbqp-ipAddrBlock
-id-pe 8                        : sbqp-autonomousSysNum
-id-pe 9                        : sbqp-routerIdentifier
+id-pe 7                        : sbgp-ipAddrBlock
+id-pe 8                        : sbgp-autonomousSysNum
+id-pe 9                        : sbgp-routerIdentifier
 id-pe 10               : ac-proxying
 !Cname sinfo-access
 id-pe 11               : subjectInfoAccess     : Subject Information Access
@@ -484,6 +492,7 @@ id-it 12            : id-it-revPassphrase
 id-it 13               : id-it-implicitConfirm
 id-it 14               : id-it-confirmWaitTime
 id-it 15               : id-it-origPKIMessage
+id-it 16               : id-it-suppLangTags
 
 # CRMF registration
 id-pkip 1              : id-regCtrl
@@ -570,6 +579,7 @@ id-ad 2                     : caIssuers             : CA Issuers
 id-ad 3                        : ad_timestamping       : AD Time Stamping
 !Cname ad-dvcs
 id-ad 4                        : AD_DVCS               : ad dvcs
+id-ad 5                        : caRepository          : CA Repository
 
 
 !Alias id-pkix-OCSP ad-OCSP
@@ -657,6 +667,8 @@ X500algorithms 3 100        : RSA-MDC2              : mdc2WithRSA
 X500algorithms 3 101   : MDC2                  : mdc2
 
 X500 29                        : id-ce
+!Cname subject-directory-attributes
+id-ce 9                        : subjectDirectoryAttributes : X509v3 Subject Directory Attributes
 !Cname subject-key-identifier
 id-ce 14               : subjectKeyIdentifier  : X509v3 Subject Key Identifier
 !Cname key-usage
@@ -677,6 +689,10 @@ id-ce 21           : CRLReason             : X509v3 CRL Reason Code
 id-ce 24               : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27               : deltaCRL              : X509v3 Delta CRL Indicator
+!Cname issuing-distribution-point
+id-ce 28               : issuingDistributionPoint : X509v3 Issuing Distrubution Point
+!Cname certificate-issuer
+id-ce 29               : certificateIssuer     : X509v3 Certificate Issuer
 !Cname name-constraints
 id-ce 30               : nameConstraints       : X509v3 Name Constraints
 !Cname crl-distribution-points
@@ -1047,3 +1063,51 @@ rsadsi 1 1 6             : rsaOAEPEncryptionSET
 
                        : Oakley-EC2N-3         : ipsec3
                        : Oakley-EC2N-4         : ipsec4
+
+
+# Definitions for Camellia cipher - CBC MODE
+1 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC           : camellia-128-cbc
+1 2 392 200011 61 1 1 1 3 : CAMELLIA-192-CBC           : camellia-192-cbc
+1 2 392 200011 61 1 1 1 4 : CAMELLIA-256-CBC           : camellia-256-cbc
+
+# Definitions for Camellia cipher - ECB, CFB, OFB MODE
+!Alias ntt-ds 0 3 4401 5
+!Alias camellia ntt-ds 3 1 9 
+
+camellia 1             : CAMELLIA-128-ECB              : camellia-128-ecb
+!Cname camellia-128-ofb128
+camellia 3             : CAMELLIA-128-OFB              : camellia-128-ofb
+!Cname camellia-128-cfb128
+camellia 4             : CAMELLIA-128-CFB              : camellia-128-cfb
+
+camellia 21            : CAMELLIA-192-ECB              : camellia-192-ecb
+!Cname camellia-192-ofb128
+camellia 23            : CAMELLIA-192-OFB              : camellia-192-ofb
+!Cname camellia-192-cfb128
+camellia 24            : CAMELLIA-192-CFB              : camellia-192-cfb
+
+camellia 41            : CAMELLIA-256-ECB              : camellia-256-ecb
+!Cname camellia-256-ofb128
+camellia 43            : CAMELLIA-256-OFB              : camellia-256-ofb
+!Cname camellia-256-cfb128
+camellia 44            : CAMELLIA-256-CFB              : camellia-256-cfb
+
+# There are no OIDs for these modes...
+
+                       : CAMELLIA-128-CFB1             : camellia-128-cfb1
+                       : CAMELLIA-192-CFB1             : camellia-192-cfb1
+                       : CAMELLIA-256-CFB1             : camellia-256-cfb1
+                       : CAMELLIA-128-CFB8             : camellia-128-cfb8
+                       : CAMELLIA-192-CFB8             : camellia-192-cfb8
+                       : CAMELLIA-256-CFB8             : camellia-256-cfb8
+
+
+# Definitions for SEED cipher - ECB, CBC, OFB mode
+
+member-body 410 200004  : KISA          : kisa
+kisa 1 3                : SEED-ECB      : seed-ecb
+kisa 1 4                : SEED-CBC      : seed-cbc
+!Cname seed-cfb128
+kisa 1 5                : SEED-CFB      : seed-cfb
+!Cname seed-ofb128
+kisa 1 6                : SEED-OFB      : seed-ofb