X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/2d3b825d0876f639b68ee1d0cb5c356f7268991c..5a72d0f31f02b3bac0725604a178e50713a1cbaf:/config.m4

diff --git a/config.m4 b/config.m4
index 1731d59..981f672 100644
--- a/config.m4
+++ b/config.m4
@@ -79,6 +79,14 @@ DEFCONF(relay_clients, <m4_dnl
 ; 172.29.198.161 ; 2001:ba8:1d9:a000::1:1 m4_dnl national
 )
 
+## TLS certificate list.
+DEFCONF(certlist,
+<:m4_ifelse(t, m4_ifelse(MODE, hub, nil, MODE, srv, nil, t),
+<:CONF_sysconf_dir/server.certlist:>,
+<:CONF_sysconf_dir/${if ={$received_port}{CONF_submission_port}{server}\
+			{${if match_ip{$sender_host_address}{+trusted} \
+				      {server}{letsencrypt}}}}.certlist:>):>)
+
 ## TLS-related settings.  We're assuming GNUTLS here, rather than OpenSSL.
 ## For local connections we are very strict.  For random clients, we try
 ## fairly hard to encourage any kind of crypto on the grounds that probably
@@ -97,12 +105,19 @@ DEFCONF(good_ciphers, NONE<::>m4_dnl
 :+COMP-NULL<::>m4_dnl
 )
 DEFCONF(acceptable_ciphers, NONE<::>m4_dnl
+:+VERS-TLS-ALL<::>m4_dnl
 :+ECDHE-RSA:+ECDHE-ECDSA<::>m4_dnl
+:+KX-ALL<::>m4_dnl
+:+SIGN-ALL<::>m4_dnl
+:+CTYPE-ALL<::>m4_dnl
 :+CHACHA20-POLY1305<::>m4_dnl
 :+AES-256-GCM:+AES-128-GCM<::>m4_dnl
+:+CIPHER-ALL<::>m4_dnl
 :+CURVE-X25519<::>m4_dnl
+:+CURVE-ALL<::>m4_dnl
 :+AEAD<::>m4_dnl
-:+NORMAL<::>m4_dnl
+:+MAC-ALL<::>m4_dnl
+:+COMP-NULL<::>m4_dnl
 :-MD5<::>m4_dnl
 )