diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-03-03 00:58:27 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-04 00:21:20 +0100 |
| commit | aacfb134be2a88211b79dc53bb5bd0e422dbb60d (patch) | |
| tree | 5b247240da2fcc6e55e00a6296e0cc0ad3eb8fc5 /crypto/evp | |
| parent | Remove overzealous echoing (diff) | |
| download | openssl-aacfb134be2a88211b79dc53bb5bd0e422dbb60d.tar.xz openssl-aacfb134be2a88211b79dc53bb5bd0e422dbb60d.zip | |
GH355: Implement HKDF
This patch implements the HMAC-based Extract-and-Expand Key Derivation
Function (HKDF) as defined in RFC 5869.
It is required to implement the QUIC and TLS 1.3 protocols (among others).
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 44a6a05249..9ae61cf22e 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -90,7 +90,8 @@ static const EVP_PKEY_METHOD *standard_methods[] = { #ifndef OPENSSL_NO_DH &dhx_pkey_meth, #endif - &tls1_prf_pkey_meth + &tls1_prf_pkey_meth, + &hkdf_pkey_meth }; DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *, |