From: heraklit256 <heraklit256@users.noreply.github.com>
Date: Mon, 15 Apr 2019 18:28:39 +0000 (+0200)
Subject: [Conf] oversign openpgp and autocrypt headers
X-Git-Tag: 1.9.2~10^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df39ac32d61c9fa6b9139dd1fc670fc9da9f7342;p=rspamd.git

[Conf] oversign openpgp and autocrypt headers
---

diff --git a/lualib/lua_ffi/dkim.lua b/lualib/lua_ffi/dkim.lua
index 00724f005..8735d8709 100644
--- a/lualib/lua_ffi/dkim.lua
+++ b/lualib/lua_ffi/dkim.lua
@@ -81,7 +81,7 @@ local default_dkim_headers =
 "(o)to:(o)cc:(o)mime-version:(o)content-type:(o)content-transfer-encoding:" ..
 "resent-to:resent-cc:resent-from:resent-sender:resent-message-id:" ..
 "(o)in-reply-to:(o)references:list-id:list-owner:list-unsubscribe:" ..
-"list-subscribe:list-post"
+"list-subscribe:list-post:(o)openpgp:(o)autocrypt"
 
 local function create_sign_context(task, privkey, dkim_headers, sign_type)
   if not task or not privkey then
@@ -137,4 +137,4 @@ return {
   load_sign_key = load_sign_key,
   create_sign_context = create_sign_context,
   do_sign = do_sign
-}
\ No newline at end of file
+}
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 9861d1eb7..8964d99ba 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -58,13 +58,13 @@ static const gchar default_sign_headers[] = ""
 		"(o)to:(o)cc:(o)mime-version:(o)content-type:(o)content-transfer-encoding:"
 		"resent-to:resent-cc:resent-from:resent-sender:resent-message-id:"
 		"(o)in-reply-to:(o)references:list-id:list-owner:list-unsubscribe:"
-		"list-subscribe:list-post";
+		"list-subscribe:list-post:(o)openpgp:(o)autocrypt";
 static const gchar default_arc_sign_headers[] = ""
 		"(o)from:(o)sender:(o)reply-to:(o)subject:(o)date:(o)message-id:"
 		"(o)to:(o)cc:(o)mime-version:(o)content-type:(o)content-transfer-encoding:"
 		"resent-to:resent-cc:resent-from:resent-sender:resent-message-id:"
 		"(o)in-reply-to:(o)references:list-id:list-owner:list-unsubscribe:"
-		"list-subscribe:list-post:dkim-signature";
+		"list-subscribe:list-post:dkim-signature:(o)openpgp:(o)autocrypt";
 
 struct dkim_ctx {
 	struct module_ctx ctx;