[icinga-checkins] icinga.org: icinga2/master: Revert "Use the server' s preferred cipher for the API connection"

git at icinga.org git at icinga.org
Wed May 25 16:07:25 CEST 2016


Module: icinga2
Branch: master
Commit: fcb43c4cb54fc443a3a98b897db4dfd46df3426f
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=fcb43c4cb54fc443a3a98b897db4dfd46df3426f

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed May 25 16:06:14 2016 +0200

Revert "Use the server's preferred cipher for the API connection"

This reverts commit ce3062904f0697f470b5a9213f2b805e8eae3087.

---

 lib/base/tlsutility.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index 772b889..83bb7c1 100644
--- a/lib/base/tlsutility.cpp
+++ b/lib/base/tlsutility.cpp
@@ -85,7 +85,7 @@ boost::shared_ptr<SSL_CTX> MakeSSLContext(const String& pubkey, const String& pr
 
 	boost::shared_ptr<SSL_CTX> sslContext = boost::shared_ptr<SSL_CTX>(SSL_CTX_new(SSLv23_method()), SSL_CTX_free);
 
-	long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_CIPHER_SERVER_PREFERENCE;
+	long flags = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
 
 #ifdef SSL_OP_NO_COMPRESSION
 	flags |= SSL_OP_NO_COMPRESSION;



More information about the icinga-checkins mailing list