Browse Source

[Minor] Make lua_ffi more flexible to use

tags/2.6
Vsevolod Stakhov 3 years ago
parent
commit
98591e36db
2 changed files with 11 additions and 2 deletions
  1. 6
    2
      lualib/lua_ffi/init.lua
  2. 5
    0
      lualib/rspamadm/mime.lua

+ 6
- 2
lualib/lua_ffi/init.lua View File

@@ -34,8 +34,7 @@ else
local ret,result_or_err = pcall(require, 'ffi')

if not ret then
io.stderr:write('FFI support is required: please use LuaJIT or install lua-ffi')
os.exit(1)
return {}
end

ffi = result_or_err
@@ -51,4 +50,9 @@ exports.common = require "lua_ffi/common"
exports.dkim = require "lua_ffi/dkim"
exports.spf = require "lua_ffi/spf"

for k,v in pairs(ffi) do
-- Preserve all stuff to use lua_ffi as ffi itself
exports[k] = v
end

return exports

+ 5
- 0
lualib/rspamadm/mime.lua View File

@@ -754,6 +754,11 @@ local function sign_handler(opts)

local lua_dkim = require("lua_ffi").dkim

if not lua_dkim then
io.stderr:write('FFI support is required: please use LuaJIT or install lua-ffi')
os.exit(1)
end

local sign_key
if rspamd_util.file_exists(opts.key) then
sign_key = lua_dkim.load_sign_key(opts.key, 'file')

Loading…
Cancel
Save