git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DKIM: support timestamp and expiry tags in signing. Bug 2260
[exim.git]
/
test
/
confs
/
4520
diff --git
a/test/confs/4520
b/test/confs/4520
index 3127d13b3dab1783eb3af66c155dcc62526b09ba..89769230f9ed458bf49b249cc869697b32e271cf 100644
(file)
--- a/
test/confs/4520
+++ b/
test/confs/4520
@@
-18,19
+18,20
@@
dkim_verify_signers = $dkim_signers : FAKE
DDIR=DIR/aux-fixed/dkim
DDIR=DIR/aux-fixed/dkim
+log_selector = -dkim +dkim_verbose
# ----- Routers
begin routers
# ----- Routers
begin routers
-server_
dump
:
- driver =
redirec
t
- condition = ${if eq {SERVER}{server}{yes}{no}}
- data = :blackhole:
+server_
store
:
+ driver =
accep
t
+ 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
@@
-49,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
@@
-61,5
+64,16
@@
send_to_server:
.ifdef VALUE
dkim_hash = VALUE
.endif
.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
# End