diff options
| author | Pauli <paul.dale@oracle.com> | 2020-08-11 02:29:02 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-08-14 10:15:12 +0200 |
| commit | b7466c1303b2e16815092ae4ef6c97ae1f0f347d (patch) | |
| tree | a2faf89d6620fe6274bb6d02b854efcd8fde0b12 /providers/defltprov.c | |
| parent | Appease -Werror=stringop-overflow= (diff) | |
| download | openssl-b7466c1303b2e16815092ae4ef6c97ae1f0f347d.tar.xz openssl-b7466c1303b2e16815092ae4ef6c97ae1f0f347d.zip | |
Move PKCS#12 KDF to provider.
This KDF is defined in RFC7292 in appendix B. It is widely used in PKCS#12
and should be provided.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12624)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index c34c539726..083373a066 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -316,6 +316,7 @@ static const OSSL_ALGORITHM deflt_kdfs[] = { { "HKDF", "provider=default", kdf_hkdf_functions }, { "SSKDF", "provider=default", kdf_sskdf_functions }, { "PBKDF2", "provider=default", kdf_pbkdf2_functions }, + { "PKCS12KDF", "provider=default", kdf_pkcs12_functions }, { "SSHKDF", "provider=default", kdf_sshkdf_functions }, { "X963KDF", "provider=default", kdf_x963_kdf_functions }, { "TLS1-PRF", "provider=default", kdf_tls1_prf_functions }, |