kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Version 1.7.10: Don't load OpenSSL config on Win.

Browse source
This commit is contained in:
John Preston 2019-06-24 14:23:08 +02:00
parent 09162e6f19
commit d5497c3105
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Telegram/SourceFiles/platform/win/specific_win.cpp
View file

@ -27,6 +27,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <windows.ui.notifications.h> #include <windows.ui.notifications.h>
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/engine.h>
#include <openssl/err.h>
#include <dbghelp.h> #include <dbghelp.h>
#include <shlobj.h> #include <shlobj.h>
@ -278,11 +280,20 @@ int psFixPrevious() {
namespace Platform { namespace Platform {
namespace ThirdParty { namespace ThirdParty {
namespace {
void StartOpenSSL() {
// Don't use dynamic OpenSSL config, it can load unwanted DLLs.
OPENSSL_load_builtin_modules();
ENGINE_load_builtin_engines();
ERR_clear_error();
OPENSSL_no_config();
}
} // namespace
void start() { void start() {
// Force OpenSSL skipping the config by passing an invalid filename. StartOpenSSL();
qputenv("OPENSSL_CONF", ":/:");
OPENSSL_config(nullptr);
} }
} // namespace ThirdParty } // namespace ThirdParty