objects/objects.txt: fix RSA-SHA3-284 typo.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 073b3426f9b297156af4d86f3ef4a7149fb5e99b..841e9aba9c725a8adc45019dd0d05756432626ff 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -930,17 +930,52 @@ aes 48                    : id-aes256-wrap-pad
                        : DES-EDE3-CFB1         : des-ede3-cfb1
                        : DES-EDE3-CFB8         : des-ede3-cfb8
 
-# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
+# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84 and
+# http://csrc.nist.gov/groups/ST/crypto_apps_infra/csor/algorithms.html
+# "Middle" names are specified to be id-sha256, id-sha384, etc., but
+# we adhere to unprefixed capitals for backward compatibility...
 !Alias nist_hashalgs nistAlgorithms 2
 nist_hashalgs 1                : SHA256                : sha256
 nist_hashalgs 2                : SHA384                : sha384
 nist_hashalgs 3                : SHA512                : sha512
 nist_hashalgs 4                : SHA224                : sha224
+nist_hashalgs 5                : SHA512-224            : sha512-224
+nist_hashalgs 6                : SHA512-256            : sha512-256
+nist_hashalgs 7                : SHA3-224              : sha3-224
+nist_hashalgs 8                : SHA3-256              : sha3-256
+nist_hashalgs 9                : SHA3-384              : sha3-384
+nist_hashalgs 10       : SHA3-512              : sha3-512
+nist_hashalgs 11       : SHAKE128              : shake128
+nist_hashalgs 12       : SHAKE256              : shake256
+nist_hashalgs 13       : id-hmacWithSHA3-224   : hmac-sha3-224
+nist_hashalgs 14       : id-hmacWithSHA3-256   : hmac-sha3-256
+nist_hashalgs 15       : id-hmacWithSHA3-384   : hmac-sha3-384
+nist_hashalgs 16       : id-hmacWithSHA3-512   : hmac-sha3-512
+# Below two are incomplete OIDs, to be uncommented when we figure out
+# how to handle them...
+# nist_hashalgs 17     : id-shake128-len       : shake128-len
+# nist_hashalgs 18     : id-shake256-len       : shake256-len
 
 # 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
+# Above two belong below, but kept as they are for backward compatibility
+!Alias sigAlgs nistAlgorithms 3
+sigAlgs 3      : id-dsa-with-sha384    : dsa_with_SHA384
+sigAlgs 4      : id-dsa-with-sha512    : dsa_with_SHA512
+sigAlgs 5      : id-dsa-with-sha3-224  : dsa_with_SHA3-224
+sigAlgs 6      : id-dsa-with-sha3-256  : dsa_with_SHA3-256
+sigAlgs 7      : id-dsa-with-sha3-384  : dsa_with_SHA3-384
+sigAlgs 8      : id-dsa-with-sha3-512  : dsa_with_SHA3-512
+sigAlgs 9      : id-ecdsa-with-sha3-224        : ecdsa_with_SHA3-224
+sigAlgs 10     : id-ecdsa-with-sha3-256        : ecdsa_with_SHA3-256
+sigAlgs 11     : id-ecdsa-with-sha3-384        : ecdsa_with_SHA3-384
+sigAlgs 12     : id-ecdsa-with-sha3-512        : ecdsa_with_SHA3-512
+sigAlgs 13     : id-rsassa-pkcs1-v1_5-with-sha3-224    : RSA-SHA3-224
+sigAlgs 14     : id-rsassa-pkcs1-v1_5-with-sha3-256    : RSA-SHA3-256
+sigAlgs 15     : id-rsassa-pkcs1-v1_5-with-sha3-384    : RSA-SHA3-384
+sigAlgs 16     : id-rsassa-pkcs1-v1_5-with-sha3-512    : RSA-SHA3-512
 
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code
@@ -1407,6 +1442,13 @@ aria 15                 : ARIA-256-CTR                  : aria-256-ctr
                         : ARIA-192-CFB8                 : aria-192-cfb8
                         : ARIA-256-CFB8                 : aria-256-cfb8
 
+aria 37                 : ARIA-128-CCM                  : aria-128-ccm
+aria 38                 : ARIA-192-CCM                  : aria-192-ccm
+aria 39                 : ARIA-256-CCM                  : aria-256-ccm
+aria 34                 : ARIA-128-GCM                  : aria-128-gcm
+aria 35                 : ARIA-192-GCM                  : aria-192-gcm
+aria 36                 : ARIA-256-GCM                  : aria-256-gcm
+
 # Definitions for SEED cipher - ECB, CBC, OFB mode
 
 member-body 410 200004  : KISA          : kisa
@@ -1489,7 +1531,8 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 1 3 6 1 4 1 311 60 2 1 3       : jurisdictionC         : jurisdictionCountryName
 
 # SCRYPT algorithm
-1 3 6 1 4 1 11591 4 11         : id-scrypt
+!Cname id-scrypt
+1 3 6 1 4 1 11591 4 11         : id-scrypt         : scrypt
 
 # NID for TLS1 PRF
                             : TLS1-PRF          : tls1-prf