RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-26 06:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: ssl: move ssl_sock_ctx and fix cross-dependencies issues

Browse Source 
In order to move all SSL sample fetches in another file, moving the
ssl_sock_ctx definition in a .h file is required.

Unfortunately it became a cross dependencies hell to solve, because of
the struct wait_event field, so <types/connection.h> is needed which
created other problems.
This commit is contained in:
William Lallemand 2020-05-15 00:20:53 +02:00 committed by William Lallemand
parent ef76107a4b
commit c0cdaffaa3
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/ssl_sock.h
View File

@ -28,6 +28,7 @@
#include <types/connection.h>
#include <types/listener.h>
#include <types/proxy.h>
#include <types/ssl_sock.h>
#include <types/stream_interface.h>
#include <proto/connection.h>

7
include/types/listener.h
View File

@ -27,7 +27,6 @@
#ifdef USE_OPENSSL
#include <common/openssl-compat.h>
#include <types/ssl_sock.h>
#endif
#include <common/config.h>
@ -112,6 +111,12 @@ enum li_state {
#define BC_SSL_O_PREF_CLIE_CIPH 0x0200 /* prefer client ciphers */
#endif
struct tls_version_filter {
uint16_t flags; /* ssl options */
uint8_t min; /* min TLS version */
uint8_t max; /* max TLS version */
};
/* ssl "bind" settings */
struct ssl_bind_conf {
#ifdef USE_OPENSSL

21
include/types/ssl_sock.h
View File

@ -27,6 +27,7 @@
#include <ebmbtree.h>
#include <eb64tree.h>
#include <types/connection.h> /* struct wait_event */
#include <types/ssl_ckch.h>
#include <types/ssl_crtlist.h>
@ -131,12 +132,6 @@ struct sni_ctx {
struct ebmb_node name; /* node holding the servername value */
};
struct tls_version_filter {
uint16_t flags; /* ssl options */
uint8_t min; /* min TLS version */
uint8_t max; /* max TLS version */
};
extern struct list tlskeys_reference;
struct tls_sess_key_128 {
@ -233,6 +228,20 @@ struct ssl_capture {
char ciphersuite[0];
};
struct ssl_sock_ctx {
struct connection *conn;
SSL *ssl;
BIO *bio;
const struct xprt_ops *xprt;
void *xprt_ctx;
struct wait_event wait_event;
struct wait_event *subs;
int xprt_st; /* transport layer state, initialized to zero */
struct buffer early_buf; /* buffer to store the early data received */
int sent_early_data; /* Amount of early data we sent so far */
};
struct global_ssl {
char *crt_base; /* base directory path for certificates */
char *ca_base; /* base directory path for CAs and CRLs */

14
src/ssl_sock.c
View File

@ -143,20 +143,6 @@ struct global_ssl global_ssl = {
static BIO_METHOD *ha_meth;
struct ssl_sock_ctx {
struct connection *conn;
SSL *ssl;
BIO *bio;
const struct xprt_ops *xprt;
void *xprt_ctx;
struct wait_event wait_event;
struct wait_event *subs;
int xprt_st; /* transport layer state, initialized to zero */
struct buffer early_buf; /* buffer to store the early data received */
int sent_early_data; /* Amount of early data we sent so far */
};
DECLARE_STATIC_POOL(ssl_sock_ctx_pool, "ssl_sock_ctx_pool", sizeof(struct ssl_sock_ctx));
static struct task *ssl_sock_io_cb(struct task *, void *, unsigned short);