Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
4437:d9473bd5ed43 4438:4a4e33c9082d
274 274
275 CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ acseTimeout, &net_)); 275 CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ acseTimeout, &net_));
276 CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU)); 276 CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU));
277 277
278 #if ORTHANC_ENABLE_SSL == 1 278 #if ORTHANC_ENABLE_SSL == 1
279 if (false) // TODO - Configuration option 279 if (parameters.GetRemoteModality().IsDicomTlsEnabled())
280 { 280 {
281 try 281 try
282 { 282 {
283 assert(net_ != NULL && 283 assert(net_ != NULL &&
284 params_ != NULL); 284 params_ != NULL);
285 285
286 // TODO - Configuration options 286 tls_.reset(Internals::InitializeDicomTls(net_, NET_REQUESTOR, parameters.GetOwnPrivateKeyPath(),
287 tls_.reset(Internals::InitializeDicomTls(net_, NET_REQUESTOR, 287 parameters.GetOwnCertificatePath(),
288 "/tmp/j/Client.key", "/tmp/j/Client.crt", "/tmp/j/Server.crt")); 288 parameters.GetTrustedCertificatesPath()));
289 } 289 }
290 catch (OrthancException&) 290 catch (OrthancException&)
291 { 291 {
292 CloseInternal(); 292 CloseInternal();
293 throw; 293 throw;