Skip to content

Commit

Permalink
Replace deprecated mysql_ssl_set() with mysql_options() calls
Browse files Browse the repository at this point in the history
The helper function mysql_ssl_set() is deprecated since MySQL 8.2, so
use the recommended replacement instead.

The documentation doesn't mention since when are the SSL options
available but it looks like they have been there for sufficiently long
time to not create any problems.
  • Loading branch information
vadz committed Dec 7, 2023
1 parent 7855843 commit 4e7b97f
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions src/backends/mysql/session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,27 @@ mysql_session_backend::mysql_session_backend(
}
if (ssl_ca_p)
{
mysql_ssl_set(conn_, ssl_key_p ? ssl_key.c_str() : NULL,
ssl_cert_p ? ssl_cert.c_str() : NULL,
ssl_ca.c_str(), 0, 0);
if (0 != mysql_options(conn_, MYSQL_OPT_SSL_CA, ssl_ca.c_str()))
{
clean_up();
throw soci_error("mysql_options(MYSQL_OPT_SSL_CA) failed.");
}
}
if (ssl_key_p)
{
if (0 != mysql_options(conn_, MYSQL_OPT_SSL_KEY, ssl_key.c_str()))
{
clean_up();
throw soci_error("mysql_options(MYSQL_OPT_SSL_KEY) failed.");
}
}
if (ssl_cert_p)
{
if (0 != mysql_options(conn_, MYSQL_OPT_SSL_CERT, ssl_cert.c_str()))
{
clean_up();
throw soci_error("mysql_options(MYSQL_OPT_SSL_CERT) failed.");
}
}
if (local_infile_p && local_infile == 1)
{
Expand Down

0 comments on commit 4e7b97f

Please sign in to comment.