aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-02-12 13:05:47 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-02-12 13:06:02 +0100
commit621940e04090919f87d452723cfddd427e561812 (patch)
tree4fecd977619aa07e0109520834045f9be93f0453 /src
parent2f3f4af4cc2b92b8758858d0a1c13635065eb379 (diff)
parenta0a17b3e441ac82bc64ca183d458258ded26c9ed (diff)
Merge #7520: LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead
a0a17b3 LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead (Pavel Janík)
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 9ca417b83a..95235def59 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1091,8 +1091,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
-#else
+#elif defined OPENSSL_VERSION
LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
+#elif defined LIBRESSL_VERSION_TEXT
+ LogPrintf("Using %s\n", LIBRESSL_VERSION_TEXT);
#endif
#ifdef ENABLE_WALLET