From 3cdde0f425971dc586b2a0f7de68a2fe0ca6e6d1 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 27 Aug 2016 00:35:28 +0900
Subject: Compile with openssl 1.1.0

We moved @CPPUNIT_LIBS@ to later position.  This is because in my
development environment, it adds linker search directory which
contains system default openssl, while I'd like to use my custom
openssl installation.  This fix is not universal, since other
libraries can do the same thing.  It is a bit hard to fix this
properly because we mix -L and -l in a same variable.
---
 src/LibsslMessageDigestImpl.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/LibsslMessageDigestImpl.cc')

diff --git a/src/LibsslMessageDigestImpl.cc b/src/LibsslMessageDigestImpl.cc
index 15ebccbe..11c107f6 100644
--- a/src/LibsslMessageDigestImpl.cc
+++ b/src/LibsslMessageDigestImpl.cc
@@ -38,10 +38,11 @@
 #include <openssl/evp.h>
 
 #include "Adler32MessageDigestImpl.h"
+#include "libssl_compat.h"
 
 namespace aria2 {
 
-#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100001L
+#if !OPENSSL_101_API
 namespace {
 EVP_MD_CTX* EVP_MD_CTX_new() { return EVP_MD_CTX_create(); }
 } // namespace
@@ -57,8 +58,7 @@ int EVP_MD_CTX_reset(EVP_MD_CTX* ctx)
   return 1;
 }
 } // namespace
-#endif // defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER <
-       // 0x10100001L
+#endif // !OPENSSL_101_API
 
 template <const EVP_MD* (*init_fn)()>
 class MessageDigestBase : public MessageDigestImpl {
-- 
cgit