Skip to content

Commit faf12bc

Browse files
author
MarcoFalke
committed
OpenSSL 1.1.0: Fix text variant of the version number
1 parent 616d61b commit faf12bc

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

src/init.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
10261026
if (fPrintToDebugLog)
10271027
OpenDebugLog();
10281028

1029+
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
10291030
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
1031+
#else
1032+
LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
1033+
#endif
1034+
10301035
#ifdef ENABLE_WALLET
10311036
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
10321037
#endif

src/qt/rpcconsole.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,13 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) :
263263
connect(ui->btnClearTrafficGraph, SIGNAL(clicked()), ui->trafficGraph, SLOT(clear()));
264264

265265
// set library version labels
266+
267+
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
266268
ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
269+
#else
270+
ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION));
271+
#endif
272+
267273
#ifdef ENABLE_WALLET
268274
ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
269275
#else

0 commit comments

Comments
 (0)