From: Lukas Tribus <luky-37@hotmail.com>
Date: Wed, 11 Jan 2017 22:47:18 +0000 (+0000)
Subject: MINOR: ssl: don't show prefer-server-ciphers output
X-Git-Tag: v1.8-dev1~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3eb5b3fdd314a086cfcc04e3160dbc82e03d834a;p=thirdparty%2Fhaproxy.git

MINOR: ssl: don't show prefer-server-ciphers output

The output of whether prefer-server-ciphers is supported by OpenSSL
actually always show yes in 1.8, because SSL_OP_CIPHER_SERVER_PREFERENCE
is redefined before the actual check in src/ssl_sock.c, since it was
moved from here from src/haproxy.c.

Since this is not really relevant anymore as we don't support OpenSSL
< 0.9.7 anyway, this change just removes this output.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 62b983aa43..3705917a8f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -6794,13 +6794,6 @@ static void __ssl_sock_init(void)
 #endif
 	       "", ptr);
 
-	memprintf(&ptr, "%s\nOpenSSL library supports prefer-server-ciphers : "
-#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
-		"yes"
-#else
-		"no (0.9.7 or later needed)"
-#endif
-		"", ptr);
 	hap_register_build_opts(ptr, 1);
 
 	global.ssl_session_max_cost   = SSL_SESSION_MAX_COST;