diff options
| author | K1 <dongbeiouba@gmail.com> | 2022-09-13 20:16:43 +0800 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-09-15 17:03:56 +0200 |
| commit | 48963ff6d0d07648e09e63d2dca9fb6069241f42 (patch) | |
| tree | a041320da0c9dd267b15dc61229e9220185fc954 /crypto/evp | |
| parent | ef6d6e452dc57ef4a55d7a6ec0693be650009bb5 (diff) | |
Add support for PBE using hmacWithSM3
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19204)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_pbe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 87b1856c19..71e757c28d 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -83,6 +83,9 @@ static const EVP_PBE_CTL builtin_pbe[] = { {EVP_PBE_TYPE_PRF, NID_hmac_sha3_512, -1, NID_sha3_512, 0}, {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0}, {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0}, +#ifndef OPENSSL_NO_SM3 + {EVP_PBE_TYPE_PRF, NID_hmacWithSM3, -1, NID_sm3, 0}, +#endif {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex}, #ifndef OPENSSL_NO_SCRYPT {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex} |