Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp @ 4438:4a4e33c9082d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configuration options for DICOM TLS in Orthanc SCU
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 07 Jan 2021 16:53:35 +0100
parents d9473bd5ed43
children 5209a9ff6e38
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Wed Jan 06 17:27:28 2021 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Thu Jan 07 16:53:35 2021 +0100
@@ -276,16 +276,16 @@
     CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU));
 
 #if ORTHANC_ENABLE_SSL == 1
-    if (false)   // TODO - Configuration option
+    if (parameters.GetRemoteModality().IsDicomTlsEnabled())
     {
       try
       {
         assert(net_ != NULL &&
                params_ != NULL);
         
-        // TODO - Configuration options
-        tls_.reset(Internals::InitializeDicomTls(net_, NET_REQUESTOR,
-                                                 "/tmp/j/Client.key", "/tmp/j/Client.crt", "/tmp/j/Server.crt"));
+        tls_.reset(Internals::InitializeDicomTls(net_, NET_REQUESTOR, parameters.GetOwnPrivateKeyPath(),
+                                                 parameters.GetOwnCertificatePath(),
+                                                 parameters.GetTrustedCertificatesPath()));
       }
       catch (OrthancException&)
       {