# HG changeset patch # User Alain Mazy # Date 1600248248 -7200 # Node ID db38b2ad4c4a12549d54673b63f4e9ae0ced9094 # Parent 2bc49197f806de908894652352085027939fdbeb fix diff -r 2bc49197f806 -r db38b2ad4c4a NEWS --- a/NEWS Wed Sep 16 10:22:25 2020 +0200 +++ b/NEWS Wed Sep 16 11:24:08 2020 +0200 @@ -19,7 +19,7 @@ * When checking DICOM allowed methods, if there are multiple modalities with the same AET, differentiate them from the calling IP * Enable the access to raw frames in Philips ELSCINT1 proprietary compression - +* Support empty key passwords when using client certificates Version 1.7.3 (2020-08-24) diff -r 2bc49197f806 -r db38b2ad4c4a OrthancFramework/Sources/HttpClient.cpp --- a/OrthancFramework/Sources/HttpClient.cpp Wed Sep 16 10:22:25 2020 +0200 +++ b/OrthancFramework/Sources/HttpClient.cpp Wed Sep 16 11:24:08 2020 +0200 @@ -788,11 +788,7 @@ #if ORTHANC_ENABLE_SSL == 1 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERTTYPE, "PEM")); CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_SSLCERT, clientCertificateFile_.c_str())); - - if (!clientCertificateKeyPassword_.empty()) - { - CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_KEYPASSWD, clientCertificateKeyPassword_.c_str())); - } + CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_KEYPASSWD, clientCertificateKeyPassword_.c_str())); // NB: If no "clientKeyFile_" is provided, the key must be // prepended to the certificate file