From: Matt Caswell <matt@openssl.org>
Date: Fri, 24 Mar 2023 12:02:37 +0000 (+0000)
Subject: Don't attempt a QUIC connection without specifying ALPN
X-Git-Tag: openssl-3.2.0-alpha1~904
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98f4212b778e3b6b7c15b9fce0a3531f59777a2;p=thirdparty%2Fopenssl.git

Don't attempt a QUIC connection without specifying ALPN

ALPN is required for a successful QUIC connection, so do not allow the
-quic option for s_client without -alpn

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20580)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index f0ea14a2848..2301c70449d 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2166,6 +2166,10 @@ int s_client_main(int argc, char **argv)
         BIO_printf(bio_err, "%s: QUIC does not support the -tfo option\n", prog);
         goto end;
     }
+    if (isquic && alpn_in == NULL) {
+        BIO_printf(bio_err, "%s: QUIC requires ALPN to be specified (e.g. \"h3\" for HTTP/3) via the -alpn option\n", prog);
+        goto end;
+    }
 #endif
 
     if (tfo)