hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2483: Take SSLContext into use

Browse Source 
SSLContext is now used everywhere except the binlogrouter which still
allocates the contexts itself. Fixing the binlogrouter's misuse of
internal structures is a rather large undertaking and for this reason the
SSLContext will be taken into use there in a separate commit.
This commit is contained in:
Markus Mäkelä
2019-05-17 16:35:22 +03:00
parent 73796be9d6
commit 82add11e86
8 changed files with 24 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/mysql_utils.cc
View File

@ -155,11 +155,11 @@ char* mxs_lestr_consume(uint8_t** c, size_t* size)
MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, const char* passwd)
{
mxs::SSLContext* listener = server->server_ssl;
mxs::SSLContext* ssl = server->server_ssl;
if (listener)
if (ssl)
{
mysql_ssl_set(con, listener->ssl_key, listener->ssl_cert, listener->ssl_ca_cert, NULL, NULL);
mysql_ssl_set(con, ssl->ssl_key(), ssl->ssl_cert(), ssl->ssl_ca(), NULL, NULL);
}
char yes = 1;
@ -204,7 +204,7 @@ MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, cons
mysql_get_character_set_info(mysql, &cs_info);
server->charset = cs_info.number;
if (listener && mysql_get_ssl_cipher(con) == NULL)
if (ssl && mysql_get_ssl_cipher(con) == NULL)
{
if (server->warn_ssl_not_enabled)
{