summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-09-24 12:49:03 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-09-24 12:49:03 +0100
commitf85f97bfddc543cf211b94ec5784fd2c61832ac9 (patch)
tree37e7706b0b443685c02e3ee60f937d055e749b89 /src
parent0910bae60573d2b1218acfa6a62a557291c19ca3 (diff)
downloadrspamd-f85f97bfddc543cf211b94ec5784fd2c61832ac9.tar.gz
rspamd-f85f97bfddc543cf211b94ec5784fd2c61832ac9.zip
[Minor] Fix rawkey loading in arc module
Diffstat (limited to 'src')
-rw-r--r--src/plugins/lua/arc.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/lua/arc.lua b/src/plugins/lua/arc.lua
index ebc3ac280..bf6010c3f 100644
--- a/src/plugins/lua/arc.lua
+++ b/src/plugins/lua/arc.lua
@@ -394,13 +394,19 @@ local function arc_sign_seal(task, params, header)
local privkey
if params.rawkey then
- privkey = rspamd_rsa_privkey.load_pem(params.rawkey)
+ -- Distinguish between pem and base64
+ if string.match(params.rawkey, '^-----BEGIN') then
+ privkey = rspamd_rsa_privkey.load_pem(params.rawkey)
+ else
+ privkey = rspamd_rsa_privkey.load_base64(params.rawkey)
+ end
elseif params.key then
privkey = rspamd_rsa_privkey.load_file(params.key)
end
if not privkey then
rspamd_logger.errx(task, 'cannot load private key for signing')
+ return
end
if settings.reuse_auth_results then