From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Nov 2015 15:40:31 +0000 (-0500)
Subject: Merge branch 'bug17549'
X-Git-Tag: tor-0.2.8.1-alpha~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a3eed5f204dc9759e5001c7cf2bb448015d6891;p=thirdparty%2Ftor.git

Merge branch 'bug17549'
---

0a3eed5f204dc9759e5001c7cf2bb448015d6891
diff --cc src/test/test_tortls.c
index fd3d50cf7e,90bf0d3ce5..dceecf49ab
--- 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