diff options
| -rw-r--r-- | wsd/Storage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 44442f549c..58fa397d4d 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -136,18 +136,18 @@ void StorageBase::initialize() if (SSLEnabled || SSLAsScheme) { - if (COOLWSD::isSSLTermination()) - { - sslClientParams.certificateFile = COOLWSD::getPathFromConfig("storage.ssl.cert_file_path"); - sslClientParams.privateKeyFile = COOLWSD::getPathFromConfig("storage.ssl.key_file_path"); - sslClientParams.caLocation = COOLWSD::getPathFromConfig("storage.ssl.ca_file_path"); - } - else + if (COOLWSD::isSSLEnabled()) { sslClientParams.certificateFile = COOLWSD::getPathFromConfigWithFallback("storage.ssl.cert_file_path", "ssl.cert_file_path"); sslClientParams.privateKeyFile = COOLWSD::getPathFromConfigWithFallback("storage.ssl.key_file_path", "ssl.key_file_path"); sslClientParams.caLocation = COOLWSD::getPathFromConfigWithFallback("storage.ssl.ca_file_path", "ssl.ca_file_path"); } + else + { + sslClientParams.certificateFile = COOLWSD::getPathFromConfig("storage.ssl.cert_file_path"); + sslClientParams.privateKeyFile = COOLWSD::getPathFromConfig("storage.ssl.key_file_path"); + sslClientParams.caLocation = COOLWSD::getPathFromConfig("storage.ssl.ca_file_path"); + } sslClientParams.cipherList = COOLWSD::getPathFromConfigWithFallback("storage.ssl.cipher_list", "ssl.cipher_list"); const bool sslVerification = COOLWSD::getConfigValue<bool>("ssl.ssl_verification", true); sslClientParams.verificationMode = !sslVerification ? Poco::Net::Context::VERIFY_NONE : Poco::Net::Context::VERIFY_STRICT; |