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

MXS-2483: Rename SSL_LISTENER to mxs::SSLContext

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-17 15:47:34 +03:00
parent 650230455a
commit cab336ed89
13 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/maxscale/listener.hh
View File

@ -144,9 +144,9 @@ public:
const char* state() const;
/**
* The SSL_LISTENER object
* The mxs::SSLContext object
*/
SSL_LISTENER* ssl() const;
mxs::SSLContext* ssl() const;
/**
* Convert to JSON
@ -209,7 +209,7 @@ private:
std::string m_authenticator; /**< Name of authenticator */
std::string m_auth_options; /**< Authenticator options */
void* m_auth_instance; /**< Authenticator instance */
SSL_LISTENER* m_ssl; /**< Structure of SSL data or NULL */
mxs::SSLContext* m_ssl; /**< Structure of SSL data or NULL */
struct users* m_users; /**< The user data for this listener */
SERVICE* m_service; /**< The service which used by this listener */
std::atomic<bool> m_active; /**< True if the port has not been deleted */
@ -249,7 +249,7 @@ private:
*/
Listener(SERVICE* service, const std::string& name, const std::string& address, uint16_t port,
const std::string& protocol, const std::string& authenticator,
const std::string& auth_opts, void* auth_instance, SSL_LISTENER* ssl,
const std::string& auth_opts, void* auth_instance, mxs::SSLContext* ssl,
const MXS_CONFIG_PARAMETER& params);
/**

6
include/maxscale/server.hh
View File

@ -181,9 +181,9 @@ public:
* routing sessions. */
// Base variables
bool is_active = false; /**< Server is active and has not been "destroyed" */
SSL_LISTENER* server_ssl = nullptr; /**< SSL data */
uint8_t charset = DEFAULT_CHARSET;/**< Character set. Read from backend and sent to client. */
bool is_active = false; /**< Server is active and has not been "destroyed" */
mxs::SSLContext* server_ssl = nullptr; /**< SSL data */
uint8_t charset = DEFAULT_CHARSET; /**< Character set. Read from backend and sent to client. */
// Statistics and events
ConnStats stats; /**< The server statistics, e.g. number of connections */

20
include/maxscale/ssl.hh
View File

@ -49,11 +49,14 @@ enum ssl_method_type_t
#define SSL_ERROR_CLIENT_NOT_SSL 1
#define SSL_ERROR_ACCEPT_FAILED 2
namespace maxscale
{
/**
* The ssl_listener structure is used to aggregate the SSL configuration items
* and data for a particular listener
*/
struct SSL_LISTENER
struct SSLContext
{
SSL_CTX* ctx;
SSL_METHOD* method; /**< SSLv3 or TLS1.0/1.1/1.2 methods
@ -67,9 +70,8 @@ struct SSL_LISTENER
char* ssl_ca_cert; /**< SSL CA certificate */
bool ssl_init_done; /**< If SSL has already been initialized for this service */
bool ssl_verify_peer_certificate; /**< Enable peer certificate verification */
SSL_LISTENER* next; /**< Next SSL configuration, currently used to store obsolete configurations */
};
}
int ssl_authenticate_client(DCB* dcb, bool is_capable);
bool ssl_is_connection_healthy(DCB* dcb);
@ -92,7 +94,7 @@ ssl_method_type_t string_to_ssl_method_type(const char* str);
int ssl_authenticate_check_status(DCB* dcb);
// TODO: Move this to an internal ssl.h header
void write_ssl_config(int fd, SSL_LISTENER* ssl);
void write_ssl_config(int fd, mxs::SSLContext* ssl);
/**
* Set the maximum SSL/TLS version the listener will support
@ -102,7 +104,7 @@ void write_ssl_config(int fd, SSL_LISTENER* ssl);
*
* @return 0 on success, -1 on invalid version string
*/
int listener_set_ssl_version(SSL_LISTENER* ssl_listener, const char* version);
int listener_set_ssl_version(mxs::SSLContext* ssl_listener, const char* version);
/**
* Set the locations of the listener's SSL certificate, listener's private key
@ -113,7 +115,7 @@ int listener_set_ssl_version(SSL_LISTENER* ssl_listener, const char* version);
* @param key SSL private key
* @param ca_cert SSL CA certificate
*/
void listener_set_certificates(SSL_LISTENER* ssl_listener, const std::string& cert,
void listener_set_certificates(mxs::SSLContext* ssl_listener, const std::string& cert,
const std::string& key, const std::string& ca_cert);
/**
@ -131,11 +133,11 @@ void listener_set_certificates(SSL_LISTENER* ssl_listener, const std::string& ce
*
* @return True on success, false on error
*/
bool SSL_LISTENER_init(SSL_LISTENER* ssl);
bool SSL_LISTENER_init(mxs::SSLContext* ssl);
/**
* Free an SSL_LISTENER
*
* @param ssl SSL_LISTENER to free
* @param ssl mxs::SSLContext to free
*/
void SSL_LISTENER_free(SSL_LISTENER* ssl);
void SSL_LISTENER_free(mxs::SSLContext* ssl);