diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl --- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl 2020-05-01 23:07:25.696000000 -0400 +++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl 2020-05-01 23:41:57.772000000 -0400 @@ -6,9 +6,14 @@ my $proto = ''; $proto .= ' !SSLv2' unless ($dovecot{'SSLv2'} || 'disabled') eq 'enabled'; $proto .= ' !SSLv3' unless ($dovecot{'SSLv3'} || 'disabled') eq 'enabled'; -$proto .= ' !TLSv1' unless ($dovecot{'TLSv1'} || 'enabled') eq 'enabled'; +$proto .= ' !TLSv1' unless ($dovecot{'TLSv1'} || 'disabled') eq 'enabled'; +$proto .= ' !TLSv1.1' unless ($dovecot{'TLSv1.1'} || 'disabled') eq 'enabled'; +$proto .= ' !TLSv1.2' unless ($dovecot{'TLSv1.2'} || 'enabled') eq 'enabled'; -$OUT .= "ssl_protocols =$proto\n" if ($proto ne ''); -$OUT .= "ssl_cipher_list = " . ($dovecot{CipherSuite} || $modSSL{CipherSuite} || 'HIGH:!SSLv2:!ADH:!aNULL:!MD5:!RC4') . "\n"; +my $dh = $dovecot{'dh'} || '4096'; +$OUT .= "ssl_dh_parameters_length = $dh\n"; +$OUT .= "ssl_protocols = $proto\n" if ($proto ne ''); +$OUT .= "ssl_prefer_server_ciphers = yes\n"; +$OUT .= "ssl_cipher_list = " . ($dovecot{CipherSuite} || $modSSL{CipherSuite} || 'ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:HIGH@STRENGTH:!SSLv2:!ADH:!aNULL:!MD5:!RC4') . "\n"; }