commit 27e456cd72f33bff0e940a337877511ab7e5bb72 Merge: 72a5ae8c6 5af29fbb6 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 21 08:53:48 2018 -0400 Merge remote-tracking branch 'rl1987/ticket19979_2' changes/ticket19979 | 3 ++ src/common/crypto_hkdf.c | 97 ++++++++++++++++++++++++++++++++++++++++++++---- src/test/test_crypto.c | 9 ----- 3 files changed, 92 insertions(+), 17 deletions(-) diff --cc src/common/crypto_hkdf.c index 46c30bc72,24d2ffd86..dd29c73ce --- a/src/common/crypto_hkdf.c +++ b/src/common/crypto_hkdf.c @@@ -9,10 -9,17 +9,18 @@@ * \brief Block of functions related with HKDF utilities and operations. **/ -#include "crypto_hkdf.h" -#include "crypto_util.h" -#include "crypto_digest.h" +#include "common/crypto_hkdf.h" +#include "common/crypto_util.h" +#include "common/crypto_digest.h" + + #include "crypto_openssl_mgt.h" + #include <openssl/opensslv.h> + + #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + #define HAVE_OPENSSL_HKDF 1 + #include <openssl/kdf.h> + #endif + /** Given <b>key_in_len</b> bytes of negotiated randomness in <b>key_in</b> * ("K"), expand it into <b>key_out_len</b> bytes of negotiated key material in * <b>key_out</b> by taking the first <b>key_out_len</b> bytes of