diff options
| author | Ronald Tse <ronald.tse@ribose.com> | 2017-10-31 15:19:14 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-10-31 15:19:14 +1000 |
| commit | f19a5ff9ab85313f5b30cfc9fbed3a2eea60a59d (patch) | |
| tree | e93336cc7c31d2a41e19b1c906135a6ec91cabfc /crypto/objects/obj_mac.num | |
| parent | ffd23209933ea0ad5543f15ca6303d63d8dac826 (diff) | |
SM4: Add SM4 block cipher to EVP
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4552)
Diffstat (limited to 'crypto/objects/obj_mac.num')
| -rw-r--r-- | crypto/objects/obj_mac.num | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 26495f2a05..4e5f702c29 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1130,3 +1130,13 @@ ffdhe6144 1129 ffdhe8192 1130 cmcCA 1131 cmcRA 1132 +sm4_ecb 1133 +sm4_cbc 1134 +sm4_ofb128 1135 +sm4_cfb1 1136 +sm4_cfb128 1137 +sm4_cfb8 1138 +sm4_ctr 1139 +ISO_CN 1140 +oscca 1141 +sm_scheme 1142 |