Mercurial > hg > orthanc
changeset 2273:1ca3c2065059 Orthanc-1.1.0
Merged in Barnerd/orthanc/Barnerd/fix-build-with-libressl-completely-re-1488028252315 (pull request #4)
Fix build with LibreSSL
| author | Sébastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 28 Feb 2017 08:29:52 +0000 |
| parents | 2fd8c1fa6076 (current diff) 0ad32aeae9f3 (diff) |
| children | |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp Thu Nov 17 09:30:22 2016 +0100 +++ b/OrthancServer/OrthancInitialization.cpp Tue Feb 28 08:29:52 2017 +0000 @@ -534,7 +534,9 @@ #if ORTHANC_SSL_ENABLED == 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();