From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Tue, 14 Nov 2017 11:49:22 +0000 (+0200)
Subject: lib-master: Drop support for SSL_TXT_SSLV2 in master-service-ssl-settings.c
X-Git-Tag: 2.3.0.rc1~465
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b478435d7a697c1c945c0efddd1a0570a4959af;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Drop support for SSL_TXT_SSLV2 in master-service-ssl-settings.c

OpenSSL headers are not included in master-service-ssl-settings.c, so
the check for SSL_TXT_SSLV2 is broken at the moment, and the feature is
not worth supporting since SSLv2 is obsolete.
---

diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index a377e1a97f..6744d31993 100644
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -57,11 +57,7 @@ static const struct master_service_ssl_settings master_service_ssl_default_setti
 	.ssl_dh = "",
 	.ssl_cipher_list = "ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH",
 	.ssl_curve_list = "",
-#ifdef SSL_TXT_SSLV2
-	.ssl_protocols = "!SSLv2 !SSLv3",
-#else
 	.ssl_protocols = "!SSLv3",
-#endif
 	.ssl_cert_username_field = "commonName",
 	.ssl_crypto_device = "",
 	.ssl_verify_client_cert = FALSE,