Testsuite: track newer GnuTLS behaviour

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 8515d050d718508f0823966a24553b947c48b8d9..3b8d781eae3fe3c9cabbccd3e88a9492bd8ec941 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -24,14 +24,14 @@ log_selector = -dkim +dkim_verbose
 
 begin 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:
 
 client:

-  driver = accept
-  transport = send_to_server
+  driver =     accept
+  transport =  send_to_server

 
 # ----- Transports
 
 
 # ----- Transports
 


@@ -50,9 +50,11 @@ send_to_server:
   dkim_selector =      sel
 .endif
 
   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
 
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =  OPT


@@ -62,5 +64,13 @@ send_to_server:
 .ifdef VALUE
   dkim_hash =          VALUE
 .endif
 .ifdef VALUE
   dkim_hash =          VALUE
 .endif

+.ifdef STRICT
+  dkim_strict =                STRICT
+.endif
+
+file:
+  driver =     appendfile
+  file =       DIR/test-mail/$local_part
+  user =       CALLER

 
 # End
 
 # End