Lint

Author: thevar1able

programs/keeper/keeper_main.cpp

@@ -154,7 +154,8 @@ __attribute__((constructor(0))) void init_je_malloc_message()
 #endif
 
 /// OpenSSL early initialization.
-/// Must be ran after EnvironmentChecks.cpp, as OpenSSL uses SSSE3.
+/// See also EnvironmentChecks.cpp for other static initializers.
+/// Must be ran after EnvironmentChecks.cpp, as OpenSSL uses SSE4.1 and POPCNT.
 __attribute__((constructor(202))) void init_ssl()
 {
     DB::OpenSSLInitializer::initialize();

programs/main.cpp

@@ -231,7 +231,8 @@ __attribute__((constructor(0))) void init_je_malloc_message()
 #endif
 
 /// OpenSSL early initialization.
-/// Must be ran after EnvironmentChecks.cpp, as OpenSSL uses SSSE3.
+/// See also EnvironmentChecks.cpp for other static initializers.
+/// Must be ran after EnvironmentChecks.cpp, as OpenSSL uses SSE4.1 and POPCNT.
 __attribute__((constructor(202))) void init_ssl()
 {
     DB::OpenSSLInitializer::initialize();

programs/server/Server.cpp

@@ -993,23 +993,6 @@ try
     }
 #endif
 
-    /// When building openssl into clickhouse, clickhouse owns the configuration
-    /// Therefore, the clickhouse openssl configuration should be kept separate from
-    /// the OS. Default to the one in the standard config directory, unless overridden
-    /// by a key in the config.
-    /// Note: this has to be done once at server initialization, because 'setenv' is not thread-safe.
-    if (config().has("opensslconf"))
-    {
-        std::string opensslconf_path = config().getString("opensslconf");
-        setenv("OPENSSL_CONF", opensslconf_path.c_str(), true); /// NOLINT
-    }
-    else
-    {
-        const String config_path = config().getString("config-file", "config.xml");
-        const auto config_dir = std::filesystem::path{config_path}.replace_filename("openssl.conf");
-        setenv("OPENSSL_CONF", config_dir.c_str(), true); /// NOLINT
-    }
-
     if (auto total_numa_memory = getNumaNodesTotalMemory(); total_numa_memory.has_value())
     {
         LOG_INFO(

src/Common/EnvironmentChecks.cpp

@@ -172,6 +172,7 @@ struct Checker
     }
 } checker
 #ifndef OS_DARWIN
+    /// See also main.cpp and keeper_main.cpp for other static initializers.
     __attribute__((init_priority(101)))    /// Run before other static initializers.
 #endif
 ;