X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2c47372fad0f829ddfa29d04095f57a70206469c..31f5b3492bde6a055c0c349a3d46718bd5a7e4f0:/test/confs/4520?ds=sidebyside

diff --git a/test/confs/4520 b/test/confs/4520
index 8515d050d..1ebd0817e 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -10,28 +10,32 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS
+acl_smtp_rcpt = accept logwrite = rcpt_acl: macro: _DKIM_SIGN_HEADERS
 acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
-acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status
+acl_smtp_data = accept logwrite = data_acl: dkim status $dkim_verify_status
 
-dkim_verify_signers = $dkim_signers : FAKE
+dkim_verify_signers = $dkim_signers
+dkim_verify_min_keysizes = rsa=512 ed25519=250
+.ifdef FILTER
+dkim_verify_minimal = true
+.endif
 
 DDIR=DIR/aux-fixed/dkim
 
-log_selector = -dkim +dkim_verbose
+log_selector = -dkim +dkim_verbose +received_recipients
 
 # ----- Routers
 
 begin routers
 
-server_dump:
-  driver = redirect
-  condition = ${if eq {SERVER}{server}{yes}{no}}
-  data = :blackhole:
+server_store:
+  driver =	accept
+  condition =	${if eq {SERVER}{server}{yes}{no}}
+  transport =	file
 
 client:
-  driver = accept
-  transport = send_to_server
+  driver =	accept
+  transport =	send_to_server
 
 # ----- Transports
 
@@ -42,6 +46,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =	:
 
   dkim_domain =		test.ex
 .ifdef SELECTOR
@@ -50,9 +55,11 @@ send_to_server:
   dkim_selector =	sel
 .endif
 
-  dkim_private_key =	${if match {$dkim_selector}{^ses}	{DDIR/dkim512.private} \
-			  {${if match {$dkim_selector}{^sel} {DDIR/dkim.private} \
-			  {}}}}
+  dkim_private_key =	${extract {${length_3:$dkim_selector}} {\
+				ses=dkim512.private \
+				sel=dkim.private \
+				sed=dkim_ed25519.private \
+				}{DDIR/$value}}
 
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =	OPT
@@ -62,5 +69,17 @@ send_to_server:
 .ifdef VALUE
   dkim_hash =		VALUE
 .endif
+.ifdef STRICT
+  dkim_strict =		STRICT
+.endif
+.ifdef TIMES
+  dkim_timestamps =	TIMES
+.endif
+
+file:
+  driver =	appendfile
+  file =	DIR/test-mail/$local_part
+  create_file =	DIR/test-mail
+  user =	CALLER
 
 # End