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

MXS-2483: Take SSLProvider into use

Browse Source 
Servers and listeners now have a SSLProvider member variable that is used
for all SSL related tasks.
This commit is contained in:
Markus Mäkelä
2019-05-21 11:29:26 +03:00
parent cb72b2a5cc
commit 3af66f3309
14 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/config_runtime.cc
View File

@ -434,7 +434,7 @@ bool runtime_enable_server_ssl(Server* server,
{
bool rval = false;
if (server->ssl_context())
if (server->ssl().context())
{
config_runtime_error("Server '%s' already configured to use SSL.", server->name());
}
@ -446,7 +446,7 @@ bool runtime_enable_server_ssl(Server* server,
if (ssl)
{
server->set_ssl_context(std::move(ssl));
server->ssl().set_context(std::move(ssl));
if (server->serialize())
{
@ -1903,7 +1903,7 @@ static bool validate_ssl_json(json_t* params, object_type type)
static bool process_ssl_parameters(Server* server, json_t* params)
{
mxb_assert(server->ssl_context() == NULL);
mxb_assert(server->ssl().context() == NULL);
bool rval = true;
if (have_ssl_json(params))