summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt20
-rw-r--r--doc/doc-txt/NewStuff2
2 files changed, 15 insertions, 7 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 44a274b98..4a8e1d06e 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -23800,6 +23800,7 @@ of the message. Its value must not be zero. See also &%final_timeout%&.
.option dkim_strict smtp string&!! unset
.option dkim_sign_headers smtp string&!! unset
.option dkim_hash smtp string&!! sha256
+.option dkim_identity smtp string&!! unset
DKIM signing options. For details see section &<<SECDKIMSIGN>>&.
@@ -38553,6 +38554,19 @@ is set.
.endlist
If the option is empty after expansion, DKIM signing is not done.
+.new
+.option dkim_hash smtp string&!! sha256
+Can be set alternatively to &"sha1"& to use an alternate hash
+method. Note that sha1 is now condidered insecure, and deprecated.
+
+.option dkim_identity smtp string&!! unset
+If set after expansion, the value is used to set an "i=" tag in
+the signing header. The DKIM standards restrict the permissible
+syntax of this optional tag to a mail address, with possibly-empty
+local part, an @, and a domain identical to or subdomain of the "d="
+tag value. Note that Exim does not check the value.
+.wen
+
.option dkim_canon smtp string&!! unset
This option sets the canonicalization method used when signing a message.
The DKIM RFC currently supports two methods: "simple" and "relaxed".
@@ -38572,12 +38586,6 @@ list of header names. Headers with these names will be included in the message
signature.
When unspecified, the header names recommended in RFC4871 will be used.
-.new
-.option dkim_hash smtp string&!! sha256
-Can be set alternatively to &"sha1"& to use an alternate hash
-method. Note that sha1 is now condidered insecure, and deprecated.
-.wen
-
.section "Verifying DKIM signatures in incoming mail" "SECID514"
.cindex "DKIM" "verification"
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 88def2629..39fce1eab 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -52,7 +52,7 @@ Version 4.90
is opened with a TFO cookie.
13. DKIM support for multiple signing, by domain and/or key-selector.
- DKIM support for multiple hashes.
+ DKIM support for multiple hashes, and for alternate-identity tags.
14. Exipick understands -C|--config for an alternative Exim
configuration file.