Mercurial > hg > orthanc

comparison OrthancServer/Sources/main.cpp @ 5638:4535194cbb8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
document TLS 1.3 in SslMinimumProtocolVersion
author Alain Mazy <am@orthanc.team>
date Wed, 22 May 2024 16:06:30 +0200
parents 4dd50c4b985a
children f7adfb22e20e
comparison
equal deleted inserted replaced
5637:7043e646fc0d 5638:4535194cbb8a
1104 std::string certificate = lock.GetConfiguration().InterpretStringParameterAsPath( 1104 std::string certificate = lock.GetConfiguration().InterpretStringParameterAsPath(
1105 lock.GetConfiguration().GetStringParameter("SslCertificate", "certificate.pem")); 1105 lock.GetConfiguration().GetStringParameter("SslCertificate", "certificate.pem"));
1106 httpServer.SetSslEnabled(true); 1106 httpServer.SetSslEnabled(true);
1107 httpServer.SetSslCertificate(certificate.c_str()); 1107 httpServer.SetSslCertificate(certificate.c_str());
1108 1108
1109 // Default to TLS 1.2 as SSL minimum 1109 // Default to TLS 1.2+1.3 as SSL minimum
1110 // See https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md "ssl_protocol_version" for mapping 1110 // See https://github.com/civetweb/civetweb/blob/master/docs/UserManual.md "ssl_protocol_version" for mapping
1111 static const unsigned int TLS_1_2 = 4; 1111 static const unsigned int TLS_1_2_AND_1_3 = 4;
1112 unsigned int minimumVersion = lock.GetConfiguration().GetUnsignedIntegerParameter("SslMinimumProtocolVersion", TLS_1_2); 1112 unsigned int minimumVersion = lock.GetConfiguration().GetUnsignedIntegerParameter("SslMinimumProtocolVersion", TLS_1_2_AND_1_3);
1113 httpServer.SetSslMinimumVersion(minimumVersion); 1113 httpServer.SetSslMinimumVersion(minimumVersion);
1114 1114
1115 static const char* SSL_CIPHERS_ACCEPTED = "SslCiphersAccepted"; 1115 static const char* SSL_CIPHERS_ACCEPTED = "SslCiphersAccepted";
1116 1116
1117 std::list<std::string> ciphers; 1117 std::list<std::string> ciphers;