Merge InitSslContext() into MakeAsioSslContext()

Author: Al2Klimov

lib/base/tlsutility.cpp

@@ -73,8 +73,21 @@ void InitializeOpenSSL()
 	l_SSLInitialized = true;
 }
 
-static void InitSslContext(const Shared<TlsContext>::Ptr& context, const String& pubkey, const String& privkey, const String& cakey)
+/**
+ * Initializes an SSL context using the specified certificates.
+ *
+ * @param pubkey The public key.
+ * @param privkey The matching private key.
+ * @param cakey CA certificate chain file.
+ * @returns An SSL context.
+ */
+Shared<TlsContext>::Ptr MakeAsioSslContext(const String& pubkey, const String& privkey, const String& cakey)
 {
+	namespace ssl = boost::asio::ssl;
+
+	InitializeOpenSSL();
+
+	auto context (Shared<TlsContext>::Make(TlsContext::tls));
 	char errbuf[256];
 
 	// Enforce TLS v1.2 as minimum
@@ -193,25 +206,6 @@ static void InitSslContext(const Shared<TlsContext>::Ptr& context, const String&
 
 		SSL_CTX_set_client_CA_list(sslContext, cert_names);
 	}
-}
-
-/**
- * Initializes an SSL context using the specified certificates.
- *
- * @param pubkey The public key.
- * @param privkey The matching private key.
- * @param cakey CA certificate chain file.
- * @returns An SSL context.
- */
-Shared<TlsContext>::Ptr MakeAsioSslContext(const String& pubkey, const String& privkey, const String& cakey)
-{
-	namespace ssl = boost::asio::ssl;
-
-	InitializeOpenSSL();
-
-	auto context (Shared<TlsContext>::Make(TlsContext::tls));
-
-	InitSslContext(context, pubkey, privkey, cakey);
 
 	return context;
 }