Updates from master

Reviewed-on: #35
Disabled SSL enforcement in libmariadb
2024-11-17 09:14:08 +02:00 · 2024-11-16 19:14:16 +00:00 · 2024-11-16 18:17:12 +02:00
1 changed files with 8 additions and 0 deletions
--- a/src/libsql/src/CAsyncSQL.cpp
+++ b/src/libsql/src/CAsyncSQL.cpp
@ -132,6 +132,14 @@ bool CAsyncSQL::Connect()
 		}
 	}

+    // Disable MYSQL_OPT_SSL_VERIFY_SERVER_CERT (enabled by default in libmariadb >=3.4)
+    bool verifyServerCert = false;
+    if (mysql_options(&m_hDB, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,  &verifyServerCert) != 0)
+    {
+        SPDLOG_ERROR("Disabling MYSQL_OPT_SSL_VERIFY_SERVER_CERT failed: {}", mysql_error(&m_hDB));
+        return false;
+    }
+
 	if (!mysql_real_connect(&m_hDB, m_stHost.c_str(), m_stUser.c_str(), m_stPassword.c_str(), m_stDB.c_str(), m_iPort, NULL, CLIENT_MULTI_STATEMENTS))
 	{
        SPDLOG_ERROR("MySQL connection failed: {}", mysql_error(&m_hDB));
Author	SHA1	Message	Date
Exynox	0f259307df	Updates from master Reviewed-on: #35	2024-11-17 09:14:08 +02:00
Exynox	db0a0fef64	Disabled SSL enforcement in libmariadb	2024-11-16 19:14:16 +00:00
Exynox	671c514cb6	Merge updates from the `nightly` branch Reviewed-on: #34	2024-11-16 18:17:12 +02:00