DANE: fix TA-mode verify under GnuTLS. Bug 2311

[exim.git] / test / confs / 4520

diff --git a/test/confs/4520 b/test/confs/4520
index 5f46498467015c8df8267d53faa90d199e2eea2c..3b8d781eae3fe3c9cabbccd3e88a9492bd8ec941 100644 (file)
--- a/test/confs/4520
+++ b/test/confs/4520
@@ -2,6 +2,7 @@
 
 SERVER=
 OPT=
+FAKE =
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -9,23 +10,28 @@ primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept
-acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+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
 
 DDIR=DIR/aux-fixed/dkim
 
+log_selector = -dkim +dkim_verbose
+
 # ----- 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
 
@@ -44,15 +50,27 @@ 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
+.else
+  dkim_identity =      allheaders@$dkim_domain
 .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