1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: ssl: Fix wolfssl build

Browse Source 
The newly added SSL traces require an extra 'conn' parameter to
ssl_sock_chose_sni_ctx which was added in the "regular" code but not in
the wolfssl specific one.
Wolfssl also has a different prototype for some getter functions
(SSL_get_servername for instance), which do not expect a const SSL while
openssl version does.
This commit is contained in:
Remi Tricot-Le Breton 2025-04-30 15:26:30 +02:00 committed by William Lallemand
parent 7dc4e94830
commit f191a830d8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ssl_clienthello.c
View File

@ -624,6 +624,7 @@ sni_lookup:
*/ */
int ssl_sock_switchctx_wolfSSL_cbk(WOLFSSL* ssl, void* arg) int ssl_sock_switchctx_wolfSSL_cbk(WOLFSSL* ssl, void* arg)
{ {
struct connection *conn = SSL_get_ex_data(ssl, ssl_app_data_index);
struct bind_conf *s = arg; struct bind_conf *s = arg;
int has_rsa_sig = 0, has_ecdsa_sig = 0; int has_rsa_sig = 0, has_ecdsa_sig = 0;
const char *servername; const char *servername;

2
src/ssl_trace.c
View File

@ -120,7 +120,7 @@ static void ssl_trace(enum trace_level level, uint64_t mask, const struct trace_
} }
if (mask & SSL_EV_CONN_HNDSHK) { if (mask & SSL_EV_CONN_HNDSHK) {
const SSL *ssl = a2; SSL *ssl = (SSL*)a2;
if (ssl && src->verbosity > SSL_VERB_SIMPLE) { if (ssl && src->verbosity > SSL_VERB_SIMPLE) {
const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);