diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 15:13:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 15:13:44 +0200 |
| commit | 8df6b010eb83a77c2249f385d56af9bbe7d42978 (patch) | |
| tree | f39922662a020c8cb9626ef343e8bf4dfd15a397 /src | |
| parent | Merge pull request #2691 (diff) | |
| parent | Initialize openssl on startup (diff) | |
| download | monero-8df6b010eb83a77c2249f385d56af9bbe7d42978.tar.xz | |
Merge pull request #2696
937e7f8a Initialize openssl on startup (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/util.cpp b/src/common/util.cpp index 30746f680..1e180d325 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -549,6 +549,13 @@ std::string get_nix_version_display_string() if (!strcmp(ver, "2.25")) MCLOG_RED(el::Level::Warning, "global", "Running with glibc " << ver << ", hangs may occur - change glibc version if possible"); #endif + +#if OPENSSL_VERSION_NUMBER < 0x10100000 + SSL_library_init(); +#else + OPENSSL_init_ssl(0, NULL); +#endif + return true; } void set_strict_default_file_permissions(bool strict) |