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

MXS-2483: Return std::unique_ptr from SSLContext::create

Browse Source 
Smart pointers are far nicer than raw pointers.
This commit is contained in:
Markus Mäkelä
2019-05-21 09:12:25 +03:00
parent 5b55864b06
commit 4e2d350838
10 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/core/ssl.cc
View File

@ -200,7 +200,7 @@ namespace maxscale
{
// static
SSLContext* SSLContext::create(const MXS_CONFIG_PARAMETER& params)
std::unique_ptr<SSLContext> SSLContext::create(const MXS_CONFIG_PARAMETER& params)
{
mxb_assert(access(params.get_string(CN_SSL_CA_CERT).c_str(), F_OK) == 0);
mxb_assert(params.get_string(CN_SSL_CERT).empty()
@ -208,18 +208,17 @@ SSLContext* SSLContext::create(const MXS_CONFIG_PARAMETER& params)
mxb_assert(params.get_string(CN_SSL_KEY).empty()
|| access(params.get_string(CN_SSL_KEY).c_str(), F_OK) == 0);
SSLContext* ssl = new(std::nothrow) SSLContext(params.get_string(CN_SSL_KEY),
params.get_string(CN_SSL_CERT),
params.get_string(CN_SSL_CA_CERT),
(ssl_method_type_t)params.get_enum(CN_SSL_VERSION,
ssl_version_values),
params.get_integer(CN_SSL_CERT_VERIFY_DEPTH),
params.get_bool(CN_SSL_VERIFY_PEER_CERTIFICATE));
std::unique_ptr<SSLContext> ssl(
new(std::nothrow) SSLContext(params.get_string(CN_SSL_KEY),
params.get_string(CN_SSL_CERT),
params.get_string(CN_SSL_CA_CERT),
(ssl_method_type_t)params.get_enum(CN_SSL_VERSION, ssl_version_values),
params.get_integer(CN_SSL_CERT_VERIFY_DEPTH),
params.get_bool(CN_SSL_VERIFY_PEER_CERTIFICATE)));
if (ssl && !ssl->init())
{
delete ssl;
ssl = nullptr;
ssl.reset();
}
return ssl;