commit 3640c63498399f85d44358b0d3cfd8a6d62325f4 Merge: 16dd2f7bb d38e7ddf5 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 20:39:13 2018 -0400

Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream'

src/common/crypto.c | 601 +---------------------------------------------- src/common/crypto.h | 34 --- src/common/crypto_dh.c | 509 +++++++++++++++++++++++++++++++++++++++ src/common/crypto_dh.h | 49 ++++ src/common/crypto_hkdf.c | 112 +++++++++ src/common/crypto_hkdf.h | 28 +++ src/common/crypto_rsa.c | 21 -- src/common/crypto_s2k.c | 1 + src/common/crypto_util.c | 23 ++ src/common/crypto_util.h | 3 + src/common/include.am | 4 + src/common/tortls.c | 1 + src/or/onion_ntor.c | 1 + src/or/or.h | 2 + src/tools/tor-gencert.c | 23 -- 15 files changed, 735 insertions(+), 677 deletions(-)

diff --cc src/common/crypto.c index d5b7c9691,072fed792..1c0b9cc82 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@@ -1072,17 -482,10 +482,10 @@@ crypto_global_cleanup(void ERR_free_strings(); #endif

- if (dh_param_p) - BN_clear_free(dh_param_p); - if (dh_param_p_tls) - BN_clear_free(dh_param_p_tls); - if (dh_param_g) - BN_clear_free(dh_param_g); - - dh_param_p = dh_param_p_tls = dh_param_g = NULL; + crypto_dh_free_all();

#ifndef DISABLE_ENGINES -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#ifndef OPENSSL_1_1_API ENGINE_cleanup(); #endif #endif