SM4: Add SM4 block cipher to EVP

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8f17cc4a448a01a49b4a27948c8a5e0074e00e8f..22e69b8f1cbb7f550ac59fe6fb6742be12cddd75 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -516,6 +516,8 @@ id-kp 23                : sendRouter            : Send Router
 id-kp 24                : sendProxiedRouter     : Send Proxied Router
 id-kp 25                : sendOwner             : Send Owner
 id-kp 26                : sendProxiedOwner      : Send Proxied Owner
+id-kp 27                : cmcCA                 : CMC Certificate Authority
+id-kp 28                : cmcRA                 : CMC Registration Authority
 
 # CMP information types
 id-it 1                        : id-it-caProtEncCert
@@ -579,7 +581,7 @@ id-cmc 19           : id-cmc-responseInfo
 id-cmc 21              : id-cmc-queryPending
 id-cmc 22              : id-cmc-popLinkRandom
 id-cmc 23              : id-cmc-popLinkWitness
-id-cmc 24              : id-cmc-confirmCertAcceptance 
+id-cmc 24              : id-cmc-confirmCertAcceptance
 
 # other names
 id-on 1                        : id-on-personalData
@@ -974,7 +976,7 @@ 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-284
+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
@@ -1366,7 +1368,7 @@ member-body 643 100 112   : issuerSignTool        : Signing Tool of Issuer
 # Definitions for Camellia cipher - ECB, CFB, OFB MODE
 
 !Alias ntt-ds 0 3 4401 5
-!Alias camellia ntt-ds 3 1 9 
+!Alias camellia ntt-ds 3 1 9
 
 camellia 1             : CAMELLIA-128-ECB              : camellia-128-ecb
 !Cname camellia-128-ofb128
@@ -1442,6 +1444,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
@@ -1452,6 +1461,23 @@ kisa 1 5                : SEED-CFB      : seed-cfb
 !Cname seed-ofb128
 kisa 1 6                : SEED-OFB      : seed-ofb
 
+
+# Definitions for SM4 cipher
+
+member-body 156         : ISO-CN        : ISO CN Member Body
+ISO-CN 10197            : oscca
+oscca 1                 : sm-scheme
+
+sm-scheme 104 1         : SM4-ECB             : sm4-ecb
+sm-scheme 104 2         : SM4-CBC             : sm4-cbc
+!Cname sm4-ofb128
+sm-scheme 104 3         : SM4-OFB             : sm4-ofb
+!Cname sm4-cfb128
+sm-scheme 104 4         : SM4-CFB             : sm4-cfb
+sm-scheme 104 5         : SM4-CFB1            : sm4-cfb1
+sm-scheme 104 6         : SM4-CFB8            : sm4-cfb8
+sm-scheme 104 7         : SM4-CTR             : sm4-ctr
+
 # There is no OID that just denotes "HMAC" oddly enough...
 
                        : HMAC                          : hmac
@@ -1489,7 +1515,7 @@ ISO-US 10046 2 1  : dhpublicnumber                : X9.42 DH
 1 3 36 3 3 2 8 1 1 11 : brainpoolP384r1
 1 3 36 3 3 2 8 1 1 12 : brainpoolP384t1
 1 3 36 3 3 2 8 1 1 13 : brainpoolP512r1
-1 3 36 3 3 2 8 1 1 14 : brainpoolP512t1            
+1 3 36 3 3 2 8 1 1 14 : brainpoolP512t1
 
 # ECDH schemes from RFC5753
 !Alias x9-63-scheme 1 3 133 16 840 63 0
@@ -1524,7 +1550,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
@@ -1570,3 +1597,10 @@ id-pkinit 5                     : pkInitKDC             : Signing KDC Response
                             : Poly1305     : poly1305
 # NID for SipHash
                             : SipHash      : siphash
+
+# NIDs for RFC7919 DH parameters
+                            : ffdhe2048
+                            : ffdhe3072
+                            : ffdhe4096
+                            : ffdhe6144
+                            : ffdhe8192