From 1a68757a3f196866271bf915df0a54ba1a63d593 Mon Sep 17 00:00:00 2001 From: Matthias Schoettle Date: Thu, 18 May 2023 11:56:12 -0400 Subject: [PATCH 1/3] fix: fix ssl mode num typo --- src/MySQLdb/_mysql.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c index 1f52d90b..14a057e8 100644 --- a/src/MySQLdb/_mysql.c +++ b/src/MySQLdb/_mysql.c @@ -531,10 +531,10 @@ _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) { + 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 From 25d51d8ad8f62dc6cc7025b8d321a81ddf99b037 Mon Sep 17 00:00:00 2001 From: Matthias Schoettle Date: Thu, 18 May 2023 12:00:13 -0400 Subject: [PATCH 2/3] fix enforce_tls use --- src/MySQLdb/_mysql.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c index 14a057e8..b3941bae 100644 --- a/src/MySQLdb/_mysql.c +++ b/src/MySQLdb/_mysql.c @@ -532,10 +532,10 @@ _mysql_ConnectionObject_Initialize( // TODO: Does MariaDB supports PREFERRED and VERIFY_CA? // We support only two levels for now. if (ssl_mode_num >= SSLMODE_REQUIRED) { - mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&enforce_tls); + mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, 1); } if (ssl_mode_num >= SSLMODE_VERIFY_CA) { - mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&enforce_tls); + mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, 1); } #endif } From 8def204d5001aa84088451a0a60145e8cba4e8d2 Mon Sep 17 00:00:00 2001 From: Matthias Schoettle Date: Thu, 18 May 2023 12:14:48 -0400 Subject: [PATCH 3/3] fix enforce_tls --- src/MySQLdb/_mysql.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MySQLdb/_mysql.c b/src/MySQLdb/_mysql.c index b3941bae..cc419776 100644 --- a/src/MySQLdb/_mysql.c +++ b/src/MySQLdb/_mysql.c @@ -531,11 +531,12 @@ _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. + my_bool enforce_tls = 1; if (ssl_mode_num >= SSLMODE_REQUIRED) { - mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, 1); + mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_ENFORCE, (void *)&enforce_tls); } if (ssl_mode_num >= SSLMODE_VERIFY_CA) { - mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, 1); + mysql_optionsv(&(self->connection), MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&enforce_tls); } #endif }