From: William Lallemand <wlallemand@haproxy.org>
Date: Thu, 18 Nov 2021 14:25:16 +0000 (+0100)
Subject: CLEANUP: ssl: fix wrong #else commentary
X-Git-Tag: v2.5-dev15~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=002e2068cc3429ba259ffc20b4ef77d774a065df;p=thirdparty%2Fhaproxy.git

CLEANUP: ssl: fix wrong #else commentary

The else is not for boringSSL but for the lack of Client Hello callback.
Should have been changed in 1fc44d4 ("BUILD: ssl: guard Client Hello
callbacks with HAVE_SSL_CLIENT_HELLO_CB macro instead of openssl
version").

Could be backported in 2.4.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index d53a3873f3..bc515cc136 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -2700,7 +2700,7 @@ allow_early:
 #endif
 }
 
-#else /* OPENSSL_IS_BORINGSSL */
+#else /* ! HAVE_SSL_CLIENT_HELLO_CB  */
 
 /* Sets the SSL ctx of <ssl> to match the advertised server name. Returns a
  * warning when no match is found, which implies the default (first) cert