# HG changeset patch # User Sebastien Jodogne # Date 1609772765 -3600 # Node ID 4f92f2b3a3aed40400507f6f3294277838bc1d24 # Parent fcbac3e8ac1c451c9e98bb17aed47c2ed7d5327b fix build if OpenSSL is disabled diff -r fcbac3e8ac1c -r 4f92f2b3a3ae OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp --- a/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp Mon Jan 04 15:59:32 2021 +0100 +++ b/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp Mon Jan 04 16:06:05 2021 +0100 @@ -253,8 +253,11 @@ assert(net_ == NULL && params_ == NULL && - assoc_ == NULL && - tls_.get() == NULL); + assoc_ == NULL); + +#if ORTHANC_ENABLE_SSL == 1 + assert(tls_.get() == NULL); +#endif if (proposed_.empty()) { @@ -315,7 +318,11 @@ CheckConnecting(parameters, ASC_setPresentationAddresses(params_, localHost, remoteHostAndPort)); // Set various options +#if ORTHANC_ENABLE_SSL == 1 CheckConnecting(parameters, ASC_setTransportLayerType(params_, (tls_.get() != NULL) /*opt_secureConnection*/)); +#else + CheckConnecting(parameters, ASC_setTransportLayerType(params_, false /*opt_secureConnection*/)); +#endif // Setup the list of proposed presentation contexts unsigned int presentationContextId = 1;