From: MAntoniak <47522782+MAntoniak@users.noreply.github.com>
Date: Fri, 1 Apr 2022 11:43:10 +0000 (+0200)
Subject: mbedtls: remove 'protocols' array from backend when ALPN is not used
X-Git-Tag: curl-7_83_0~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=266627b0bc47745d67c335a041836929f68ffed1;p=thirdparty%2Fcurl.git

mbedtls: remove 'protocols' array from backend when ALPN is not used

Closes #8663
---

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 659fed4e38..c96219711a 100644
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -70,6 +70,14 @@
 #include "curl_memory.h"
 #include "memdebug.h"
 
+/* ALPN for http2 */
+#ifdef USE_HTTP2
+#  undef HAS_ALPN
+#  ifdef MBEDTLS_SSL_ALPN
+#    define HAS_ALPN
+#  endif
+#endif
+
 struct ssl_backend_data {
   mbedtls_ctr_drbg_context ctr_drbg;
   mbedtls_entropy_context entropy;
@@ -82,7 +90,9 @@ struct ssl_backend_data {
 #endif
   mbedtls_pk_context pk;
   mbedtls_ssl_config config;
+#ifdef HAS_ALPN
   const char *protocols[3];
+#endif
 };
 
 /* apply threading? */
@@ -144,14 +154,6 @@ static void mbed_debug(void *context, int level, const char *f_name,
 #else
 #endif
 
-/* ALPN for http2 */
-#ifdef USE_HTTP2
-#  undef HAS_ALPN
-#  ifdef MBEDTLS_SSL_ALPN
-#    define HAS_ALPN
-#  endif
-#endif
-
 /*
  *  profile
  */