comparison OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp @ 5643:b1a18218860c

2 new configurations: DicomTlsMinimumProtocolVersion + DicomTlsCiphersAccepted
author Alain Mazy <am@orthanc.team>
date Fri, 31 May 2024 16:56:35 +0200
parents f7adfb22e20e
children 4b7bc21db336
comparison
equal deleted inserted replaced
5642:95e282478cda 5643:b1a18218860c
42 static std::string defaultOwnPrivateKeyPath_; 42 static std::string defaultOwnPrivateKeyPath_;
43 static std::string defaultOwnCertificatePath_; 43 static std::string defaultOwnCertificatePath_;
44 static std::string defaultTrustedCertificatesPath_; 44 static std::string defaultTrustedCertificatesPath_;
45 static unsigned int defaultMaximumPduLength_ = ASC_DEFAULTMAXPDU; 45 static unsigned int defaultMaximumPduLength_ = ASC_DEFAULTMAXPDU;
46 static bool defaultRemoteCertificateRequired_ = true; 46 static bool defaultRemoteCertificateRequired_ = true;
47 47 static unsigned int minimumTlsVersion_ = 0;
48 static std::set<std::string> acceptedCiphers_;
48 49
49 namespace Orthanc 50 namespace Orthanc
50 { 51 {
51 void DicomAssociationParameters::CheckHost(const std::string& host) 52 void DicomAssociationParameters::CheckHost(const std::string& host)
52 { 53 {
250 bool DicomAssociationParameters::IsRemoteCertificateRequired() const 251 bool DicomAssociationParameters::IsRemoteCertificateRequired() const
251 { 252 {
252 return remoteCertificateRequired_; 253 return remoteCertificateRequired_;
253 } 254 }
254 255
256 unsigned int DicomAssociationParameters::GetMinimumTlsVersion()
257 {
258 return minimumTlsVersion_;
259 }
255 260
261 void DicomAssociationParameters::SetMinimumTlsVersion(unsigned int version)
262 {
263 minimumTlsVersion_ = version;
264 }
265
266 void DicomAssociationParameters::SetAcceptedCiphers(const std::set<std::string>& acceptedCiphers)
267 {
268 acceptedCiphers_ = acceptedCiphers;
269 }
270
271 const std::set<std::string>& DicomAssociationParameters::GetAcceptedCiphers()
272 {
273 return acceptedCiphers_;
274 }
275
256 276
257 static const char* const LOCAL_AET = "LocalAet"; 277 static const char* const LOCAL_AET = "LocalAet";
258 static const char* const REMOTE = "Remote"; 278 static const char* const REMOTE = "Remote";
259 static const char* const TIMEOUT = "Timeout"; // New in Orthanc in 1.7.0 279 static const char* const TIMEOUT = "Timeout"; // New in Orthanc in 1.7.0
260 static const char* const OWN_PRIVATE_KEY = "OwnPrivateKey"; // New in Orthanc 1.9.0 280 static const char* const OWN_PRIVATE_KEY = "OwnPrivateKey"; // New in Orthanc 1.9.0