diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2015-11-23 18:55:26 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2015-11-24 09:07:26 +0100 |
| commit | faf12bc2839d0a858b36c371aaf26902e49e380c (patch) | |
| tree | 70f9cff728765e1ecd34a22fa66567a90ca2c254 | |
| parent | 616d61b20d56c0645412884df441eba781ec565d (diff) | |
OpenSSL 1.1.0: Fix text variant of the version number
| -rw-r--r-- | src/init.cpp | 5 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index cd84e7747a..4b3977d6df 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1026,7 +1026,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 diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 619c8631ae..b2b4fd0fab 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -263,7 +263,13 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : connect(ui->btnClearTrafficGraph, SIGNAL(clicked()), ui->trafficGraph, SLOT(clear())); // set library version labels + +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION)); +#else + ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); +#endif + #ifdef ENABLE_WALLET ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0)); #else |