Merge pull request #7083

faf12bc OpenSSL 1.1.0: Fix text variant of the version number (MarcoFalke)
2015-11-27 14:08:19 +01:00
parent 2a94cd67e8 faf12bc283
commit 9502b7f634
2 changed files with 11 additions and 0 deletions
--- 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