Fix from stable branch.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index e2a6c24c4ca25333c8e23edac904e73e2be61f9a..b4385977ee3c1bcfb4c0aba16c8d0569f7d25fc7 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
 
 
 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
 identified-organization 132    : certicom-arc
 
 joint-iso-itu-t 23     : international-organizations   : International Organizations


@@ -147,6 +151,10 @@ ISO-US 113533 7 66 10      : CAST5-CBC             : cast5-cbc
 !Cname pbeWithMD5AndCast5-CBC
 ISO-US 113533 7 66 12  :                       : pbeWithMD5AndCast5CBC
 
 !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
 ISO-US 113549          : rsadsi                : RSA Data Security, Inc.
 
 rsadsi 1               : pkcs                  : RSA Data Security, Inc. PKCS


@@ -498,6 +506,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 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
 
 # CRMF registration
 id-pkip 1              : id-regCtrl


@@ -584,6 +593,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 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
 
 
 !Alias id-pkix-OCSP ad-OCSP


@@ -1091,7 +1101,9 @@ cryptopro 19              : gost2001      : GOST R 34.10-2001
 cryptopro 20           : gost94        : GOST R 34.10-94
 !Cname id-Gost28147-89
 cryptopro 21           : gost89                : GOST 28147-89
 cryptopro 20           : gost94        : GOST R 34.10-94
 !Cname id-Gost28147-89
 cryptopro 21           : gost89                : GOST 28147-89

-cryptopro 22           : id-Gost28147-89-MAC   : GOST 28147-89 MAC
+                       : gost89-cnt
+!Cname id-Gost28147-89-MAC                     
+cryptopro 22           : gost-mac      : GOST 28147-89 MAC

 !Cname id-GostR3411-94-prf
 cryptopro 23           : prf-gostr3411-94      : GOST R 34.11-94 PRF
 cryptopro 98           : id-GostR3410-2001DH   : GOST R 34.10-2001 DH
 !Cname id-GostR3411-94-prf
 cryptopro 23           : prf-gostr3411-94      : GOST R 34.11-94 PRF
 cryptopro 98           : id-GostR3410-2001DH   : GOST R 34.10-2001 DH


@@ -1187,3 +1199,17 @@ camellia 44              : CAMELLIA-256-CFB              : camellia-256-cfb
                        : CAMELLIA-128-CFB8             : camellia-128-cfb8
                        : CAMELLIA-192-CFB8             : camellia-192-cfb8
                        : CAMELLIA-256-CFB8             : camellia-256-cfb8
                        : 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
+
+# There is no OID that just denotes "HMAC" oddly enough...
+
+                       : HMAC                          : hmac