SetTlsProtocolminToSSLContext(): take TlsProtocolMin, not String

Author: Al2Klimov

lib/base/tlsutility.cpp

@@ -296,7 +296,7 @@ Shared<TlsContext>::Ptr SetupSslContext(const String& certPath, const String& ke
 
 	if (!protocolmin.IsEmpty()){
 		try {
-			SetTlsProtocolminToSSLContext(context, protocolmin);
+			SetTlsProtocolminToSSLContext(context, ResolveTlsProtocolVersion(protocolmin));
 		} catch (const std::exception&) {
 			BOOST_THROW_EXCEPTION(ScriptError("Cannot set minimum TLS protocol version to SSL context with tls_protocolmin: '" + protocolmin + "'.", std::move(di)));
 		}
@@ -311,10 +311,10 @@ Shared<TlsContext>::Ptr SetupSslContext(const String& certPath, const String& ke
  * @param context The ssl context.
  * @param tlsProtocolmin The minimum TLS protocol version.
  */
-void SetTlsProtocolminToSSLContext(const Shared<TlsContext>::Ptr& context, const String& tlsProtocolmin)
+void SetTlsProtocolminToSSLContext(const Shared<TlsContext>::Ptr& context, TlsProtocolMin tlsProtocolmin)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
-	int ret = SSL_CTX_set_min_proto_version(context->native_handle(), ResolveTlsProtocolVersion(tlsProtocolmin));
+	int ret = SSL_CTX_set_min_proto_version(context->native_handle(), tlsProtocolmin);
 
 	if (ret != 1) {
 		char errbuf[256];
@@ -329,7 +329,7 @@ void SetTlsProtocolminToSSLContext(const Shared<TlsContext>::Ptr& context, const
 #else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
 	// This should never happen. On this OpenSSL version, ResolveTlsProtocolVersion() should either return TLS 1.2
 	// or throw an exception, as that's the only TLS version supported by both Icinga and ancient OpenSSL.
-	VERIFY(ResolveTlsProtocolVersion(tlsProtocolmin) == TLS1_2_VERSION);
+	VERIFY(tlsProtocolmin == TLS1_2_VERSION);
 #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
 }
 

lib/base/tlsutility.hpp

@@ -49,7 +49,7 @@ String GetOpenSSLVersion();
 void AddCRLToSSLContext(const Shared<TlsContext>::Ptr& context, const String& crlPath);
 void AddCRLToSSLContext(X509_STORE *x509_store, const String& crlPath);
 void SetCipherListToSSLContext(const Shared<TlsContext>::Ptr& context, const String& cipherList);
-void SetTlsProtocolminToSSLContext(const Shared<TlsContext>::Ptr& context, const String& tlsProtocolmin);
+void SetTlsProtocolminToSSLContext(const Shared<TlsContext>::Ptr& context, TlsProtocolMin tlsProtocolmin);
 TlsProtocolMin ResolveTlsProtocolVersion(const std::string& version);
 
 Shared<TlsContext>::Ptr SetupSslContext(const String& certPath = String(), const String& keyPath = String(), const String& caPath = String(),