Skip to content

Commit 83a18e0

Browse files
authored
Drop support TLS1.1 from dovecot (hestiacp#2538)
* Drop support TLS1.1 from dovecot EOL since 2020 any way and should not been used anymore hestiacp#2012 * Fix syntax error
1 parent 01fc0f4 commit 83a18e0

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

install/deb/dovecot/conf.d/10-ssl.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ssl = yes
2-
# See #2012 for TLSv1.1 to 1.2 upgrade
3-
ssl_min_protocol = TLSv1.1
2+
ssl_min_protocol = TLSv1.2
43
ssl_prefer_server_ciphers = yes
54
ssl_cipher_list = ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
65

install/hst-install-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ if [ "$dovecot" = 'yes' ]; then
16821682
echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"
16831683
sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
16841684
sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
1685-
sed -i 's|ssl_min_protocol = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
1685+
sed -i 's|ssl_min_protocol = TLSv1.2|ssl_protocols = !SSLv3 !TLSv1 !TLSv1.1|g' /etc/dovecot/conf.d/10-ssl.conf
16861686
fi
16871687

16881688
update-rc.d dovecot defaults

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,7 @@ if [ "$dovecot" = 'yes' ]; then
17561756
echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"
17571757
sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
17581758
sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
1759-
sed -i 's|ssl_min_protocol = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
1759+
sed -i 's|ssl_min_protocol = TLSv1.2|ssl_protocols = !SSLv3 !TLSv1 !TLSv1.1|g' /etc/dovecot/conf.d/10-ssl.conf
17601760
fi
17611761

17621762
update-rc.d dovecot defaults

install/upgrade/versions/1.6.0.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ if [ "$MAIL_SYSTEM" = "exim4" ]; then
4848
fi
4949
fi
5050

51+
if [ -f "/etc/dovecot/conf.d/10-ssl.conf" ]; then
52+
sed -i 's|ssl_min_protocol = TLSv1.1|ssl_min_protocol = TLSv1.2|' /etc/dovecot/conf.d/10-ssl.conf
53+
if ! grep -q "!TLSv1.1" /etc/dovecot/conf.d/10-ssl.conf; then
54+
sed -i 's|ssl_protocols = !SSLv3 !TLSv1|ssl_protocols = !SSLv3 !TLSv1 !TLSv1.1|' /etc/dovecot/conf.d/10-ssl.conf
55+
fi
56+
fi
57+
5158
# Adding LE autorenew cronjob if there are none
5259
if [ -z "$(grep v-update-lets $HESTIA/data/users/admin/cron.conf)" ]; then
5360
min=$(generate_password '012345' '2')

0 commit comments

Comments
 (0)