diff options
| author | Matt Caswell <matt@openssl.org> | 2020-07-31 16:05:57 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-08-10 15:51:59 +0200 |
| commit | 194de849ccb269272b71994edf988dc1cdbafc0d (patch) | |
| tree | 2b976cdf01bbabcafaeea67206113f5fb0b0b279 /providers/defltprov.c | |
| parent | Extend the EVP_PKEY KDF to KDF provider bridge to also support HKDF (diff) | |
| download | openssl-194de849ccb269272b71994edf988dc1cdbafc0d.tar.xz openssl-194de849ccb269272b71994edf988dc1cdbafc0d.zip | |
Extend the EVP_PKEY KDF to KDF provider bridge to also support Scrypt
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12573)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index f2fe98fc7f..00d1800c24 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -341,6 +341,7 @@ static const OSSL_ALGORITHM deflt_keyexch[] = { #endif { "TLS1-PRF", "provider=default", kdf_tls1_prf_keyexch_functions }, { "HKDF", "provider=default", kdf_hkdf_keyexch_functions }, + { "SCRYPT:id-scrypt", "provider=default", kdf_scrypt_keyexch_functions }, { NULL, NULL, NULL } }; @@ -388,6 +389,7 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = { #endif { "TLS1-PRF", "provider=default", kdf_keymgmt_functions }, { "HKDF", "provider=default", kdf_keymgmt_functions }, + { "SCRYPT:id-scrypt", "provider=default", kdf_keymgmt_functions }, { NULL, NULL, NULL } }; |