From: Willy Tarreau <w@1wt.eu>
Date: Wed, 10 Sep 2025 08:43:08 +0000 (+0200)
Subject: BUILD: ssl: address a recent build warning when QUIC is enabled
X-Git-Tag: v3.3-dev9~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdff3941952674e741eef95ad1c043be5bbbd361;p=thirdparty%2Fhaproxy.git

BUILD: ssl: address a recent build warning when QUIC is enabled

Since commit 5ab9954faa ("MINOR: ssl: Add a flag to let it known we have
an ALPN negociated"), when building with QUIC we get this warning:

  src/ssl_sock.c: In function 'ssl_sock_advertise_alpn_protos':
  src/ssl_sock.c:2189:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Let's just move the instructions after the optional declaration. No
backport is needed.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index f8640e2f1..69dd4e70e 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -2181,13 +2181,11 @@ static int ssl_sock_advertise_alpn_protos(SSL *s, const unsigned char **out,
 	struct connection *conn;
 	struct ssl_sock_ctx *ctx;
 
-	conn = SSL_get_ex_data(s, ssl_app_data_index);
-	ctx = __conn_get_ssl_sock_ctx(conn);
-
-
 #ifdef USE_QUIC
 	struct quic_conn *qc = SSL_get_ex_data(s, ssl_qc_app_data_index);
 #endif
+	conn = SSL_get_ex_data(s, ssl_app_data_index);
+	ctx = __conn_get_ssl_sock_ctx(conn);
 
 	if (SSL_select_next_proto((unsigned char**) out, outlen, (const unsigned char *)conf->alpn_str,
 	                          conf->alpn_len, server, server_len) != OPENSSL_NPN_NEGOTIATED) {