SHA512/224 and SHA512/256

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 22e69b8f1cbb7f550ac59fe6fb6742be12cddd75..74550be2df04539c521a1756c247fcd7d6373642 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -178,6 +178,8 @@ pkcs1 11            : RSA-SHA256            : sha256WithRSAEncryption
 pkcs1 12               : RSA-SHA384            : sha384WithRSAEncryption
 pkcs1 13               : RSA-SHA512            : sha512WithRSAEncryption
 pkcs1 14               : RSA-SHA224            : sha224WithRSAEncryption
+pkcs1 15               : RSA-SHA512/224        : sha512-224WithRSAEncryption
+pkcs1 16               : RSA-SHA512/256        : sha512-256WithRSAEncryption
 
 pkcs 3                 : pkcs3
 pkcs3 1                        :                       : dhKeyAgreement
@@ -371,6 +373,9 @@ rsadsi 2 5          : MD5                   : md5
 rsadsi 2 6             :                       : hmacWithMD5
 rsadsi 2 7             :                       : hmacWithSHA1
 
+member-body 156 10197 1 401 : SM3               : sm3
+member-body 156 10197 1 504 : RSA-SM3          : sm3WithRSAEncryption
+
 # From RFC4231
 rsadsi 2 8             :                       : hmacWithSHA224
 rsadsi 2 9             :                       : hmacWithSHA256
@@ -852,7 +857,7 @@ internet 6          : snmpv2                : SNMPv2
 # Documents refer to "internet 7" as "mail". This however leads to ambiguities
 # with RFC2798, Section 9.1.3, where "mail" is defined as the short name for
 # rfc822Mailbox. The short name is therefore here left out for a reason.
-# Subclasses of "mail", e.g. "MIME MHS" don't consitute a problem, as
+# Subclasses of "mail", e.g. "MIME MHS" don't constitute a problem, as
 # references are realized via long name "Mail" (with capital M).
 internet 7             :                       : Mail
 
@@ -1499,7 +1504,7 @@ ISO-US 10046 2 1  : dhpublicnumber                : X9.42 DH
 
 # RFC 5639 curve OIDs (see http://www.ietf.org/rfc/rfc5639.txt)
 # versionOne OBJECT IDENTIFIER ::= {
-# iso(1) identifified-organization(3) teletrust(36) algorithm(3)
+# iso(1) identified-organization(3) teletrust(36) algorithm(3)
 # signature-algorithm(3) ecSign(2) ecStdCurvesAndGeneration(8)
 # ellipticCurve(1) 1 }
 1 3 36 3 3 2 8 1 1 1 : brainpoolP160r1