diff options
| author | Simo Sorce <simo@redhat.com> | 2018-09-19 16:23:45 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-02-27 11:02:54 +0000 |
| commit | 8d76481b189b7195ef932e0fb8f0e23ab0120771 (patch) | |
| tree | 859eed33157350c35682cec39e7e450aaa5b7330 /crypto/evp/kdf_lib.c | |
| parent | 149c12d5e41b238ce4af6d1b6b3a767b40293bd7 (diff) | |
Implement SSH KDF
SSH's KDF is defined in RFC 4253 in Section 7.2
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7290)
Diffstat (limited to 'crypto/evp/kdf_lib.c')
| -rw-r--r-- | crypto/evp/kdf_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index 05f5cec3a9..811fe727f6 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -29,7 +29,8 @@ static const EVP_KDF_METHOD *standard_methods[] = { &scrypt_kdf_meth, #endif &tls1_prf_kdf_meth, - &hkdf_kdf_meth + &hkdf_kdf_meth, + &sshkdf_kdf_meth, }; DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_KDF_METHOD *, const EVP_KDF_METHOD *, |