WL#15983: Stop using mysql_ssl_set api

nmariz · nmariz · commit 60cf3f90bf07 · 2023-10-04T19:46:38.000+01:00
The mysql_ssl_set() C API function is being deprecated by the server.
It's used for establishing encrypted connections using SSL, and it's
a convenience function equivalent to using mysql_options() calls.

This worklog replaces the mysql_ssl_set() C API function call by
mysql_options() for setting the TLS options.

Change-Id: I10af136839c00236e3d988fcf785864410c45d10
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v8.3.0
 ======
 
+- WL#15983: Stop using mysql_ssl_set api
 - WL#15982: Remove use of mysql_shutdown
 
 v8.2.0
diff --git a/src/mysql_capi.c b/src/mysql_capi.c
@@ -1259,7 +1259,9 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
         else {
             ssl_ca = NULL;
         }
-        mysql_ssl_set(&self->session, ssl_key, ssl_cert, ssl_ca, NULL, NULL);
+        mysql_options(&self->session, MYSQL_OPT_SSL_KEY, ssl_key);
+        mysql_options(&self->session, MYSQL_OPT_SSL_CERT, ssl_cert);
+        mysql_options(&self->session, MYSQL_OPT_SSL_CA, ssl_ca);
         if (tls_versions != NULL) {
             mysql_options(&self->session, MYSQL_OPT_TLS_VERSION, tls_versions);
         }

Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,9 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1259`	`1259`	`else {`
`1260`	`1260`	`ssl_ca = NULL;`
`1261`	`1261`	`}`
`1262`		`- mysql_ssl_set(&self->session, ssl_key, ssl_cert, ssl_ca, NULL, NULL);`
	`1262`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_KEY, ssl_key);`
	`1263`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_CERT, ssl_cert);`
	`1264`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_CA, ssl_ca);`
`1263`	`1265`	`if (tls_versions != NULL) {`
`1264`	`1266`	`mysql_options(&self->session, MYSQL_OPT_TLS_VERSION, tls_versions);`
`1265`	`1267`	`}`