[tor-commits] [tor/release-0.3.3] Merge branch 'libressl_201805_029' into maint-0.3.3

[nickm at torproject.org]

commit bf3e899dcef368a021033c6845b93c08884dae02
Merge: b116710e3 75f3fbaa3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:26:49 2018 -0400

    Merge branch 'libressl_201805_029' into maint-0.3.3

 changes/ticket26006         | 4 ++++
 src/common/compat_openssl.h | 6 +++++-
 src/test/test_tortls.c      | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --cc src/common/compat_openssl.h
index 1299ac36b,76679872b..d1481fb46
--- a/src/common/compat_openssl.h
+++ b/src/common/compat_openssl.h
@@@ -8,7 -8,9 +8,8 @@@
  #define TOR_COMPAT_OPENSSL_H
  
  #include <openssl/opensslv.h>
 -// workaround for libressl; not needed in later Tor versions.
 -#include <openssl/crypto.h>
 +#include "crypto_openssl_mgt.h"
+ 
  /**
   * \file compat_openssl.h
   *
@@@ -25,10 -27,13 +26,13 @@@
  /* We define this macro if we're trying to build with the majorly refactored
   * API in OpenSSL 1.1 */
  #define OPENSSL_1_1_API
 -#endif
 +#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */
  
- #ifndef OPENSSL_1_1_API
+ #ifndef OPENSSL_VERSION
  #define OPENSSL_VERSION SSLEAY_VERSION
+ #endif
+ 
+ #ifndef OPENSSL_1_1_API
  #define OpenSSL_version(v) SSLeay_version(v)
  #define OpenSSL_version_num() SSLeay()
  #define RAND_OpenSSL() RAND_SSLeay()