commit 0a3eed5f204dc9759e5001c7cf2bb448015d6891 Merge: 0d5a439 05c34b3 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 10 10:40:31 2015 -0500

Merge branch 'bug17549'

changes/bug17549 | 3 +++ src/common/compat_openssl.h | 37 +++++++++++++++++++++++++++++++++++++ src/common/crypto.c | 33 ++++++++++++--------------------- src/common/include.am | 1 + src/common/tortls.c | 21 ++++++++++----------- src/common/tortls.h | 1 + src/test/test_tortls.c | 24 +++++++++++++----------- 7 files changed, 77 insertions(+), 43 deletions(-)

diff --cc src/test/test_tortls.c index fd3d50c,90bf0d3..dceecf4 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@@ -53,9 -53,11 +53,12 @@@ extern tor_tls_context_t *server_tls_context; extern tor_tls_context_t *client_tls_context;

-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) \ + && !defined(LIBRESSL_VERSION_NUMBER) #define OPENSSL_OPAQUE + #define SSL_STATE_STR "before SSL initialization" + #else + #define SSL_STATE_STR "before/accept initialization" #endif

#ifndef OPENSSL_OPAQUE