git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: harden versus badly-formatted AMS line
[users/jgh/exim.git]
/
test
/
confs
/
2125
diff --git
a/test/confs/2125
b/test/confs/2125
index 767bb1c4fc724d2f2ec676ff5617ca79d252f686..5898791337eaa4953d3e30cec1898b4be19fc75b 100644
(file)
--- a/
test/confs/2125
+++ b/
test/confs/2125
@@
-2,14
+2,9
@@
SERVER=
SERVER=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-23,13
+18,16
@@
queue_run_in_order
tls_advertise_hosts = *
tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
tls_advertise_hosts = *
tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
- {AES
}{!AES:3DES
}}
+ {AES
256}{AES128
}}
# Set certificate only if server
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
# Set certificate only if server
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
# ----- Routers -----
# ----- Routers -----
@@
-51,7
+49,7
@@
send_to_server:
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
hosts_require_tls = HOSTIPV4
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
hosts_require_tls = HOSTIPV4
- tls_require_ciphers =
DES-CBC3
-SHA
+ tls_require_ciphers =
AES128
-SHA
port = PORT_D
tls_try_verify_hosts = :
port = PORT_D
tls_try_verify_hosts = :