commit 2dbd077a69236f77bf4cc0067dea469cefbd5797
parent 2cd761a15e0d7705575028df37f8ea3253ba7a7e
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Thu, 11 Dec 2025 16:07:38 +0100
Fixed wrong routing values when MultiTLS is enabled and one of backends disabled
This combination is not possible currently so this error never triggered.
Diffstat:
1 file changed, 0 insertions(+), 78 deletions(-)
diff --git a/src/mhd2/tls_multi_funcs.c b/src/mhd2/tls_multi_funcs.c
@@ -351,12 +351,6 @@ mhd_tls_multi_daemon_deinit (struct mhd_TlsMultiDaemonData *restrict d_tls)
mhd_tls_open_daemon_deinit (d_tls->data.openssl);
break;
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -386,12 +380,6 @@ mhd_tls_multi_conn_get_tls_size (struct mhd_TlsMultiDaemonData *restrict d_tls)
data_size += mhd_tls_open_conn_get_tls_size (d_tls->data.openssl);
break;
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -426,12 +414,6 @@ mhd_tls_multi_conn_init (const struct mhd_TlsMultiDaemonData *restrict d_tls,
sk,
c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -462,12 +444,6 @@ mhd_tls_multi_conn_deinit (struct mhd_TlsMultiConnData *restrict c_tls)
mhd_tls_open_conn_deinit (c_tls->data.openssl);
break;
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -491,12 +467,6 @@ mhd_tls_multi_conn_handshake (struct mhd_TlsMultiConnData *restrict c_tls)
case mhd_TLS_MULTI_ROUTE_OPEN:
return mhd_tls_open_conn_handshake (c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -520,12 +490,6 @@ mhd_tls_multi_conn_shutdown (struct mhd_TlsMultiConnData *restrict c_tls)
case mhd_TLS_MULTI_ROUTE_OPEN:
return mhd_tls_open_conn_shutdown (c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -561,12 +525,6 @@ mhd_tls_multi_conn_recv (struct mhd_TlsMultiConnData *restrict c_tls,
buf,
received);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -590,12 +548,6 @@ mhd_tls_multi_conn_has_cstm_tr (struct mhd_TlsMultiConnData *restrict c_tls)
case mhd_TLS_MULTI_ROUTE_OPEN:
return mhd_tls_open_conn_has_cstm_tr (c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -618,12 +570,6 @@ mhd_tls_multi_conn_has_data_in (struct mhd_TlsMultiConnData *restrict c_tls)
case mhd_TLS_MULTI_ROUTE_OPEN:
return mhd_tls_open_conn_has_data_in (c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -661,12 +607,6 @@ mhd_tls_multi_conn_send (struct mhd_TlsMultiConnData *restrict c_tls,
push_data,
sent);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -698,12 +638,6 @@ mhd_tls_multi_conn_get_tls_sess (
tls_sess_out);
break;
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -729,12 +663,6 @@ mhd_tls_multi_conn_get_tls_ver (struct mhd_TlsMultiConnData *restrict c_tls,
return mhd_tls_open_conn_get_tls_ver (c_tls->data.openssl,
tls_ver_out);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
@@ -757,12 +685,6 @@ mhd_tls_multi_conn_get_alpn_prot (struct mhd_TlsMultiConnData *restrict c_tls)
case mhd_TLS_MULTI_ROUTE_OPEN:
return mhd_tls_open_conn_get_alpn_prot (c_tls->data.openssl);
#endif
-#ifndef MHD_SUPPORT_GNUTLS
- case MHD_TLS_BACKEND_GNUTLS:
-#endif /* ! MHD_SUPPORT_GNUTLS */
-#ifndef MHD_SUPPORT_OPENSSL
- case MHD_TLS_BACKEND_OPENSSL:
-#endif /* ! MHD_SUPPORT_OPENSSL */
case mhd_TLS_MULTI_ROUTE_NONE:
default:
mhd_UNREACHABLE ();
