Fix mariadbclient SSL support (#609)

mschoettle · web-flow · commit 398208f8c832 · 2023-05-19T02:11:13.000+09:00
diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c
@@ -531,10 +531,11 @@ _mysql_ConnectionObject_Initialize(
         // See https://github.com/PyMySQL/mysqlclient/issues/474
         // TODO: Does MariaDB supports PREFERRED and VERIFY_CA?
         // We support only two levels for now.
-        if (sslmode_num >= SSLMODE_REQUIRED) {
+        my_bool enforce_tls = 1;
+        if (ssl_mode_num >= SSLMODE_REQUIRED) {
             mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&enforce_tls);
         }
-        if (sslmode_num >= SSLMODE_VERIFY_CA) {
+        if (ssl_mode_num >= SSLMODE_VERIFY_CA) {
             mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&enforce_tls);
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -531,10 +531,11 @@ _mysql_ConnectionObject_Initialize(`
`531`	`531`	`// See https://github.com/PyMySQL/mysqlclient/issues/474`
`532`	`532`	`// TODO: Does MariaDB supports PREFERRED and VERIFY_CA?`
`533`	`533`	`// We support only two levels for now.`
`534`		`- if (sslmode_num >= SSLMODE_REQUIRED) {`
	`534`	`+ my_bool enforce_tls = 1;`
	`535`	`+ if (ssl_mode_num >= SSLMODE_REQUIRED) {`
`535`	`536`	`mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&enforce_tls);`
`536`	`537`	`}`
`537`		`- if (sslmode_num >= SSLMODE_VERIFY_CA) {`
	`538`	`+ if (ssl_mode_num >= SSLMODE_VERIFY_CA) {`
`538`	`539`	`mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&enforce_tls);`
`539`	`540`	`}`
`540`	`541`	`#endif`