add support for DSA with SHA2

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 2b756cbb322bb6c4b75507c2538742c856b22f0e..e2a6c24c4ca25333c8e23edac904e73e2be61f9a 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -75,6 +75,12 @@ X9-62_primeCurve 7           : prime256v1
 !Alias id-ecSigType ansi-X9-62 4
 !global
 X9-62_id-ecSigType 1           : ecdsa-with-SHA1
+X9-62_id-ecSigType 2           : ecdsa-with-Recommended
+X9-62_id-ecSigType 3           : ecdsa-with-Specified
+ecdsa-with-Specified 1         : ecdsa-with-SHA224
+ecdsa-with-Specified 2         : ecdsa-with-SHA256
+ecdsa-with-Specified 3         : ecdsa-with-SHA384
+ecdsa-with-Specified 4         : ecdsa-with-SHA512
 
 # SECG curve OIDs from "SEC 2: Recommended Elliptic Curve Domain Parameters"
 # (http://www.secg.org/)
@@ -338,7 +344,15 @@ rsadsi 2 2         : MD2                   : md2
 rsadsi 2 4             : MD4                   : md4
 rsadsi 2 5             : MD5                   : md5
                        : MD5-SHA1              : md5-sha1
+rsadsi 2 6             :                       : hmacWithMD5
 rsadsi 2 7             :                       : hmacWithSHA1
+
+# From RFC4231
+rsadsi 2 8             :                       : hmacWithSHA224
+rsadsi 2 9             :                       : hmacWithSHA256
+rsadsi 2 10            :                       : hmacWithSHA384
+rsadsi 2 11            :                       : hmacWithSHA512
+
 rsadsi 3 2             : RC2-CBC               : rc2-cbc
                        : RC2-ECB               : rc2-ecb
 !Cname rc2-cfb64
@@ -657,6 +671,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
@@ -678,7 +694,9 @@ 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
+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
@@ -813,6 +831,11 @@ nist_hashalgs 2            : SHA384                : sha384
 nist_hashalgs 3                : SHA512                : sha512
 nist_hashalgs 4                : SHA224                : sha224
 
+# OIDs for dsa-with-sha224 and dsa-with-sha256
+!Alias dsa_with_sha2 nistAlgorithms 3
+dsa_with_sha2 1                : dsa_with_SHA224
+dsa_with_sha2 2                : dsa_with_SHA256
+
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code
 id-ce 23               : holdInstructionCode   : Hold Instruction Code
@@ -1066,7 +1089,8 @@ cryptopro 10              : id-HMACGostR3411-94   : HMAC GOST 34.11-94
 cryptopro 19           : gost2001      : GOST R 34.10-2001
 !Cname id-GostR3410-94
 cryptopro 20           : gost94        : GOST R 34.10-94
-cryptopro 21           : id-Gost28147-89 : GOST 28147-89
+!Cname id-Gost28147-89
+cryptopro 21           : gost89                : GOST 28147-89
 cryptopro 22           : id-Gost28147-89-MAC   : GOST 28147-89 MAC
 !Cname id-GostR3411-94-prf
 cryptopro 23           : prf-gostr3411-94      : GOST R 34.11-94 PRF
@@ -1116,12 +1140,50 @@ id-GostR3410-94 4       : id-GostR3410-94-bBis
 # Cryptocom LTD GOST OIDs
 
 cryptocom 1 6 1                : id-Gost28147-89-cc    : GOST 28147-89 Cryptocom ParamSet
-!Cname id-Gost3410-94-cc
+!Cname id-GostR3410-94-cc
 cryptocom 1 5 3                : gost94cc      : GOST 34.10-94 Cryptocom
-!Cname id-Gost3410-2001-cc
+!Cname id-GostR3410-2001-cc
 cryptocom 1 5 4                : gost2001cc    : GOST 34.10-2001 Cryptocom
 
-cryptocom 1 3 3                : id-GostR3410-11-94-with-GostR3411-94-cc : GOST R 34.10 with GOST R 34.11-94 Cryptocom
-cryptocom 1 3 4                : id-GostR3410-2001-with-GostR3411-94-cc : GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom
+cryptocom 1 3 3                : id-GostR3411-94-with-GostR3410-94-cc : GOST R 34.11-94 with GOST R 34.10-94 Cryptocom
+cryptocom 1 3 4                : id-GostR3411-94-with-GostR3410-2001-cc : GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom
 
 cryptocom 1 8 1                : id-GostR3410-2001-ParamSet-cc : GOST R 3410-2001 Parameter Set Cryptocom
+
+# 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