diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-01-04 18:41:21 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-03-19 11:03:45 +0000 |
| commit | 9537fe5757bb07761fa275d779bbd40bcf5530e4 (patch) | |
| tree | cb748da879a7b00b758b710daed725113b839844 /crypto/evp/kdf_lib.c | |
| parent | 6098b69e5817068c49e63487d3424b4122a1796d (diff) | |
Single step kdf implementation
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8230)
Diffstat (limited to 'crypto/evp/kdf_lib.c')
| -rw-r--r-- | crypto/evp/kdf_lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index 811fe727f6..de2ab232e3 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -31,6 +31,7 @@ static const EVP_KDF_METHOD *standard_methods[] = { &tls1_prf_kdf_meth, &hkdf_kdf_meth, &sshkdf_kdf_meth, + &ss_kdf_meth }; DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_KDF_METHOD *, const EVP_KDF_METHOD *, |