database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

make DEFAULT_SSL_VERIFY_SERVER_CERT a cmake option

Browse Source
This commit is contained in:
Sergei Golubchik
2024-02-14 01:21:52 +01:00
parent 293f6df8c6
commit 82983a30f4
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -25,7 +25,8 @@ get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES) SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNIT_TESTS FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNIT_TESTS
WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_SQLITE WITH_SSL WITH_ICONV WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_SQLITE WITH_SSL WITH_ICONV
DEFAULT_CHARSET INSTALL_LAYOUT WITH_TEST_SRCPKG) DEFAULT_CHARSET INSTALL_LAYOUT WITH_TEST_SRCPKG
DEFAULT_SSL_VERIFY_SERVER_CERT)
SET(${V} ${${OPT}${V}}) SET(${V} ${${OPT}${V}})
ENDFOREACH() ENDFOREACH()
@@ -65,6 +66,7 @@ ADD_OPTION(WITH_DYNCOL "Enables support of dynamic columns" ON)
ADD_OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF) ADD_OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
ADD_OPTION(WITH_CURL "Enables use of curl" ON) ADD_OPTION(WITH_CURL "Enables use of curl" ON)
ADD_OPTION(WITH_SSL "Enables use of TLS/SSL library" ON) ADD_OPTION(WITH_SSL "Enables use of TLS/SSL library" ON)
ADD_OPTION(DEFAULT_SSL_VERIFY_SERVER_CERT "Default value for MYSQL_OPT_SSL_VERIFY_SERVER_CERT" ON)
############### ###############
INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake) INCLUDE(${CC_SOURCE_DIR}/cmake/misc.cmake)

1
include/ma_config.h.in
View File

@@ -148,3 +148,4 @@
#define MARIADB_DEFAULT_CHARSET "@DEFAULT_CHARSET@" #define MARIADB_DEFAULT_CHARSET "@DEFAULT_CHARSET@"
#cmakedefine DEFAULT_SSL_VERIFY_SERVER_CERT 1

14
libmariadb/mariadb_lib.c
View File

@@ -713,10 +713,19 @@ struct st_default_options mariadb_defaults[] =
{{0}, 0, NULL} {{0}, 0, NULL}
}; };
#ifdef DEFAULT_SSL_VERIFY_SERVER_CERT
#define FIX_SSL_VERIFY_SERVER_CERT(OPTS)
#else
#define FIX_SSL_VERIFY_SERVER_CERT(OPTS) (OPTS)->extension->tls_allow_invalid_server_cert=1
#endif
#define CHECK_OPT_EXTENSION_SET(OPTS)\ #define CHECK_OPT_EXTENSION_SET(OPTS)\
if (!(OPTS)->extension) \ if (!(OPTS)->extension) \
{ \
(OPTS)->extension= (struct st_mysql_options_extension *) \ (OPTS)->extension= (struct st_mysql_options_extension *) \
calloc(1, sizeof(struct st_mysql_options_extension)); calloc(1, sizeof(struct st_mysql_options_extension)); \
FIX_SSL_VERIFY_SERVER_CERT(OPTS); \
}
#define OPT_SET_EXTENDED_VALUE_BIN(OPTS, KEY, KEY_LEN, VAL, LEN)\ #define OPT_SET_EXTENDED_VALUE_BIN(OPTS, KEY, KEY_LEN, VAL, LEN)\
CHECK_OPT_EXTENSION_SET(OPTS) \ CHECK_OPT_EXTENSION_SET(OPTS) \
@@ -3522,6 +3531,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
goto end; goto end;
} }
if (!mysql->options.extension) if (!mysql->options.extension)
{
if(!(mysql->options.extension= (struct st_mysql_options_extension *) if(!(mysql->options.extension= (struct st_mysql_options_extension *)
calloc(1, sizeof(struct st_mysql_options_extension)))) calloc(1, sizeof(struct st_mysql_options_extension))))
{ {
@@ -3529,6 +3539,8 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0);
goto end; goto end;
} }
FIX_SSL_VERIFY_SERVER_CERT(&mysql->options);
}
mysql->options.extension->async_context= ctxt; mysql->options.extension->async_context= ctxt;
break; break;
case MYSQL_OPT_MAX_ALLOWED_PACKET: case MYSQL_OPT_MAX_ALLOWED_PACKET: