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

Convert maxscale/ssl.h to .hh

Browse Source
This commit is contained in:
Esa Korhonen 2019-01-15 17:12:32 +02:00
parent 6a23015b64
commit b0663f0b29
8 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/dcb.hh
View File

@ -23,7 +23,7 @@
#include <maxscale/buffer.h>
#include <maxscale/modinfo.h>
#include <maxscale/protocol.h>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#include <memory>

2
include/maxscale/listener.hh
View File

@ -21,7 +21,7 @@
#include <maxbase/jansson.h>
#include <maxscale/protocol.h>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#include <maxscale/service.hh>
#include <maxscale/routingworker.hh>

2
include/maxscale/server.hh
View File

@ -18,7 +18,7 @@
#include <string>
#include <unordered_map>
#include <maxbase/average.hh>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
// A mapping from a path to a percentage, e.g.: "/disk" -> 80.
typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;

42
include/maxscale/ssl.h → include/maxscale/ssl.hh
View File

@ -13,23 +13,21 @@
#pragma once
/**
* @file ssl.h
* @file ssl.hh
*
* The SSL definitions for MaxScale
*/
#include <maxscale/cdefs.h>
#include <maxscale/ccdefs.hh>
#include <maxscale/protocol.h>
#include <openssl/crypto.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/dh.h>
MXS_BEGIN_DECLS
struct DCB;
typedef enum ssl_method_type
enum ssl_method_type_t
{
#ifndef OPENSSL_1_1
SERVICE_TLS10,
@ -42,7 +40,7 @@ typedef enum ssl_method_type
SERVICE_TLS_MAX,
SERVICE_SSL_TLS_MAX,
SERVICE_SSL_UNKNOWN
} ssl_method_type_t;
};
/**
* Return codes for SSL authentication checks
@ -55,23 +53,23 @@ typedef enum ssl_method_type
* The ssl_listener structure is used to aggregate the SSL configuration items
* and data for a particular listener
*/
typedef struct ssl_listener
struct SSL_LISTENER
{
SSL_CTX* ctx;
SSL_METHOD* method; /*< SSLv3 or TLS1.0/1.1/1.2 methods
* see: https://www.openssl.org/docs/ssl/SSL_CTX_new.html
**/
int ssl_cert_verify_depth;/*< SSL certificate verification depth */
ssl_method_type_t ssl_method_type; /*< Which of the SSLv3 or TLS1.0/1.1/1.2 methods to use */
char* ssl_cert; /*< SSL certificate */
char* ssl_key; /*< SSL private key */
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 */
struct ssl_listener
* next; /*< Next SSL configuration, currently used to store obsolete configurations */
} SSL_LISTENER;
SSL_METHOD* method; /**< SSLv3 or TLS1.0/1.1/1.2 methods
* see: https://www.openssl.org/docs/ssl/SSL_CTX_new.html */
int ssl_cert_verify_depth;/**< SSL certificate verification depth */
ssl_method_type_t ssl_method_type; /**< Which of the SSLv3 or TLS1.0/1.1/1.2 methods to use */
char* ssl_cert; /**< SSL certificate */
char* ssl_key; /**< SSL private key */
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);
@ -95,5 +93,3 @@ 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);
MXS_END_DECLS

2
server/core/internal/config.hh
View File

@ -23,7 +23,7 @@
#include <unordered_set>
#include <maxbase/jansson.h>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#define DEFAULT_NBPOLLS 3 /**< Default number of non block polls before we block */
#define DEFAULT_POLLSLEEP 1000 /**< Default poll wait time (milliseconds) */

2
server/core/listener.cc
View File

@ -28,7 +28,7 @@
#include <string>
#include <maxscale/paths.h>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#include <maxscale/protocol.h>
#include <maxscale/alloc.h>
#include <maxscale/users.h>

2
server/core/server.cc
View File

@ -34,7 +34,7 @@
#include <maxscale/session.hh>
#include <maxscale/dcb.hh>
#include <maxscale/poll.hh>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#include <maxscale/alloc.h>
#include <maxscale/paths.h>
#include <maxscale/utils.h>

2
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -35,7 +35,7 @@
#include <maxscale/router.hh>
#include <maxscale/routingworker.hh>
#include <maxscale/session.hh>
#include <maxscale/ssl.h>
#include <maxscale/ssl.hh>
#include <maxscale/utils.h>
#include "setparser.hh"