diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 15:38:51 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 15:38:51 +1000 |
commit | 105dde2528d64b4af25c241288a985fdfc27afbc (patch) | |
tree | ed797163af31f173bc5d5a6c223206829ebed91a /crypto | |
parent | 639b53ecd82648fbb66a2ab7dabece7f15a1f730 (diff) |
Add sm4 ciphers to default provider
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9935)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/evp_enc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 4d6001688f..41edd0decd 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -247,6 +247,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, case NID_seed_ecb: case NID_seed_cfb128: case NID_seed_ofb128: + case NID_sm4_cbc: + case NID_sm4_ecb: + case NID_sm4_ctr: + case NID_sm4_cfb128: + case NID_sm4_ofb128: break; default: goto legacy; |