2 files changed, 19 insertions, 0 deletions

diff --git a/src/openssl.c b/src/openssl.c
index 8fadb02..4da28ef 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -1819,6 +1819,12 @@ static int bn__mod(lua_State *L) {
         if (!BN_mod(r, a, b, getctx(L)))
                 return auxL_error(L, auxL_EOPENSSL, "bignum:__mod");
 
+        /* lua has different rounding behaviour for mod than C */
+        if (!BN_is_zero(r) && (BN_is_negative(a) ^ BN_is_negative(b))) {
+                if (!BN_add(r, r, b))
+                        return auxL_error(L, auxL_EOPENSSL, "bignum:__mod");
+        }
+
         return 1;
 } /* bn__mod() */
 
diff --git a/src/openssl.ssl.context.lua b/src/openssl.ssl.context.lua
index 44a9163..2098b54 100644
--- a/src/openssl.ssl.context.lua
+++ b/src/openssl.ssl.context.lua
@@ -1,3 +1,16 @@
 local ctx = require"_openssl.ssl.context"
 
+local pack = table.pack or function(...) return { n = select("#", ...); ... } end
+
+-- Allow passing a vararg of ciphers, or an array
+local setCipherList; setCipherList = ctx.interpose("setCipherList", function (self, ciphers, ...)
+        if (...) then
+                local ciphers_t = pack(ciphers, ...)
+                ciphers = table.concat(ciphers_t, ":", 1, ciphers_t.n)
+        elseif type(ciphers) == "table" then
+                ciphers = table.concat(ciphers, ":")
+        end
+        return setCipherList(self, ciphers)
+end)
+
 return ctx