diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
| commit | cc75e50ca861529d50601d247fd66f806fcb23a8 (patch) | |
| tree | e2c5c7b1f98e64011b1ee8ca4e9bb9157510dfe7 /zen/open_ssl.cpp | |
| parent | Merge branch '10.17' into 'master' (diff) | |
| parent | add upstream 10.18 (diff) | |
| download | FreeFileSync-10.18.tar.gz FreeFileSync-10.18.tar.bz2 FreeFileSync-10.18.zip | |
Merge branch '10.18' into 'master'10.18
add upstream 10.18
See merge request opensource-tracking/FreeFileSync!15
Diffstat (limited to 'zen/open_ssl.cpp')
| -rw-r--r-- | zen/open_ssl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/open_ssl.cpp b/zen/open_ssl.cpp index ce05de53..dc9c8a19 100644 --- a/zen/open_ssl.cpp +++ b/zen/open_ssl.cpp @@ -28,7 +28,7 @@ void zen::openSslInit() //see Curl_ossl_cleanup(): https://github.com/curl/curl/blob/master/lib/vtls/openssl.c //excplicitly init OpenSSL on main thread: seems to initialize atomically! But it still might help to avoid issues: - [[maybe_unused]] const int rv = ::OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT, nullptr); + [[maybe_unused]] const int rv = ::OPENSSL_init_ssl(OPENSSL_INIT_SSL_DEFAULT | OPENSSL_INIT_NO_LOAD_CONFIG, nullptr); assert(rv == 1); //https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html } |