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

diff --git a/test/confs/4520 b/test/confs/4520
index 8515d050d..1a8e34f9e 100644
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -14,7 +14,7 @@ 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
 
-dkim_verify_signers = $dkim_signers : FAKE
+dkim_verify_signers = $dkim_signers
 
 DDIR=DIR/aux-fixed/dkim
 
@@ -24,14 +24,14 @@ log_selector = -dkim +dkim_verbose
 
 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
 
@@ -50,9 +50,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 +64,16 @@ 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
+  user =	CALLER
 
 # End