Skip to content

Commit f651fac

Browse files
committed
Partial revert "chore: Drop support for deprecated TLS versions (docker-mailserver#2945)"
Partial revert "4dda5f8b1ff66cdc4d1adbd3b0de3c8e82db1af9"
1 parent 0c7e49e commit f651fac

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

target/postfix/main.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ smtpd_tls_protocols = !SSLv2,!SSLv3,!TLSv1,!TLSv1.1
4444
smtp_tls_protocols = !SSLv2,!SSLv3,!TLSv1,!TLSv1.1
4545
smtpd_tls_mandatory_ciphers = high
4646
smtpd_tls_mandatory_protocols = !SSLv2,!SSLv3,!TLSv1,!TLSv1.1
47-
smtpd_tls_exclude_ciphers = aNULL, SEED, CAMELLIA, RSA+AES, SHA1
47+
smtpd_tls_exclude_ciphers = aNULL, SEED, CAMELLIA, RSA+AES
4848
smtpd_tls_dh1024_param_file = /etc/postfix/dhparams.pem
4949
smtpd_tls_CApath = /etc/ssl/certs
5050
smtp_tls_CApath = /etc/ssl/certs

target/scripts/helpers/ssl.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,24 @@ function _setup_ssl() {
143143
;;
144144

145145
( "intermediate" )
146-
local TLS_INTERMEDIATE_SUITE='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-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256'
147-
local TLS_INTERMEDIATE_IGNORE='!SSLv2,!SSLv3,!TLSv1,!TLSv1.1'
148-
local TLS_INTERMEDIATE_MIN='TLSv1.2'
146+
local TLS_INTERMEDIATE_SUITE='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'
147+
local TLS_INTERMEDIATE_IGNORE='!SSLv2,!SSLv3'
148+
local TLS_INTERMEDIATE_MIN='TLSv1'
149149

150150
_apply_tls_level "${TLS_INTERMEDIATE_SUITE}" "${TLS_INTERMEDIATE_IGNORE}" "${TLS_INTERMEDIATE_MIN}"
151151

152+
# Lowers the minimum acceptable TLS version connection to `TLSv1` (from Debian upstream `TLSv1.2`)
153+
# Lowers Security Level to `1` (from Debian upstream `2`, openssl release defaults to `1`)
154+
# https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html
155+
# https://wiki.debian.org/ContinuousIntegration/TriagingTips/openssl-1.1.1
156+
# https://dovecot.org/pipermail/dovecot/2020-October/120225.html
157+
# TODO: This is a fix for Debian Bullseye Dovecot. Can remove when we only support TLS >=1.2.
158+
# WARNING: This applies to all processes that use openssl and respect these settings.
159+
sedfile -i -r \
160+
-e 's|^(MinProtocol).*|\1 = TLSv1|' \
161+
-e 's|^(CipherString).*|\1 = DEFAULT@SECLEVEL=1|' \
162+
/usr/lib/ssl/openssl.cnf
163+
152164
_log 'debug' "TLS configured with 'intermediate' ciphers"
153165
;;
154166

0 commit comments

Comments
 (0)