X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c5db348c5e29e93e51389fa0079f829967c5da82..3063baa25c0a8103438ee73051e61f82476861b3:/test/confs/4520?ds=inline diff --git a/test/confs/4520 b/test/confs/4520 index 8fa3c38c8..1a8e34f9e 100644 --- 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 logwrite = macro: _DKIM_SIGN_HEADERS -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 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,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 @@ -56,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