aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-11-27 14:08:19 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-11-27 14:08:40 +0100
commit9502b7f634a7f75e06708ddd38ab8931313e19c9 (patch)
tree45d877d6b3f2804ea8cbb0c93b19f140584a83a5 /src/init.cpp
parent2a94cd67e80555aec3ba13d5129b1f5402b0c5b4 (diff)
parentfaf12bc2839d0a858b36c371aaf26902e49e380c (diff)
downloadbitcoin-9502b7f634a7f75e06708ddd38ab8931313e19c9.tar.xz
Merge pull request #7083
faf12bc OpenSSL 1.1.0: Fix text variant of the version number (MarcoFalke)
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp
index bc6d724d71..3e46958afc 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1049,7 +1049,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (fPrintToDebugLog)
OpenDebugLog();
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
+#else
+ LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
+#endif
+
#ifdef ENABLE_WALLET
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
#endif