diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 14:08:19 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 14:08:40 +0100 |
| commit | 9502b7f634a7f75e06708ddd38ab8931313e19c9 (patch) | |
| tree | 45d877d6b3f2804ea8cbb0c93b19f140584a83a5 /src | |
| parent | 2a94cd67e80555aec3ba13d5129b1f5402b0c5b4 (diff) | |
| parent | faf12bc2839d0a858b36c371aaf26902e49e380c (diff) | |
| download | bitcoin-9502b7f634a7f75e06708ddd38ab8931313e19c9.tar.xz | |
Merge pull request #7083
faf12bc OpenSSL 1.1.0: Fix text variant of the version number (MarcoFalke)
Diffstat (limited to 'src')
| -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 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 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 |