diff options
| author | Pauli <paul.dale@oracle.com> | 2018-08-01 03:58:39 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-08-01 03:58:39 +0200 |
| commit | f52292be10cb42c25ae83be969d3ad469ea7cb4e (patch) | |
| tree | 9cff0fd602774b7c18b778d55865629758107667 /crypto/evp | |
| parent | Ensure symbols don't get deprecated too early (diff) | |
| download | openssl-f52292be10cb42c25ae83be969d3ad469ea7cb4e.tar.xz openssl-f52292be10cb42c25ae83be969d3ad469ea7cb4e.zip | |
Add OIDs for HMAC SHA512/224 and HMAC SHA512/256.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6830)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_pbe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 7a3c61d6a3..0cebd2df1d 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -73,6 +73,8 @@ static const EVP_PBE_CTL builtin_pbe[] = { NID_id_GostR3411_2012_256, 0}, {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1, NID_id_GostR3411_2012_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}, {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen}, #ifndef OPENSSL_NO_SCRYPT {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen} |