From: Emmanuel Hocdet <manu@gandi.net>
Date: Wed, 12 Jul 2017 12:25:38 +0000 (+0200)
Subject: MINOR: ssl: remove an unecessary SSL_OP_NO_* dependancy
X-Git-Tag: v1.8-dev3~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f80bc24ddef866e9a487cb9f67877a2c4759252c;p=thirdparty%2Fhaproxy.git

MINOR: ssl: remove an unecessary SSL_OP_NO_* dependancy

Use methodVersions table to display "OpenSSL library supports".
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 7fa6420a37..fa81571554 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -8104,6 +8104,7 @@ __attribute__((constructor))
 static void __ssl_sock_init(void)
 {
 	char *ptr;
+	int i;
 
 	STACK_OF(SSL_COMP)* cm;
 
@@ -8166,23 +8167,10 @@ static void __ssl_sock_init(void)
 #endif
 	       "", ptr);
 
-	memprintf(&ptr, "%s\nOpenSSL library supports : "
-#if SSL_OP_NO_SSLv3
-		  "SSLv3 "
-#endif
-#if SSL_OP_NO_TLSv1
-		  "TLSv1.0 "
-#endif
-#if SSL_OP_NO_TLSv1_1
-		  "TLSv1.1 "
-#endif
-#if SSL_OP_NO_TLSv1_2
-		  "TLSv1.2 "
-#endif
-#if SSL_OP_NO_TLSv1_3
-		  "TLSv1.3"
-#endif
-	       "", ptr);
+	memprintf(&ptr, "%s\nOpenSSL library supports :", ptr);
+	for (i = CONF_TLSV_MIN; i <= CONF_TLSV_MAX; i++)
+		if (methodVersions[i].option)
+			memprintf(&ptr, "%s %s", ptr, methodVersions[i].name);
 
 	hap_register_build_opts(ptr, 1);