Mercurial > hg > orthanc
changeset 2271:fc260803b5df
Merged in Barnerd/orthanc-1/Barnerd/fix-build-with-libressl-libressl-comp-1488028354841 (pull request #5)
Fix build with LibreSSL
| author | Sébastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 28 Feb 2017 08:28:37 +0000 |
| parents | 8e53a2acdf21 (current diff) 512e69a0c761 (diff) |
| children | bfcf5a7f92e7 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/HttpClient.cpp Wed Feb 22 22:04:41 2017 +0100 +++ b/Core/HttpClient.cpp Tue Feb 28 08:28:37 2017 +0000 @@ -823,10 +823,12 @@ void HttpClient::FinalizeOpenSsl() { - #if ORTHANC_ENABLE_SSL == 1 +#if ORTHANC_ENABLE_SSL == 1 // Finalize OpenSSL // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup +#ifdef FIPS_mode_set FIPS_mode_set(0); +#endif ENGINE_cleanup(); CONF_modules_unload(1); EVP_cleanup();