diff options
| author | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
| commit | ca622317f100d67023e2088179011eb61a243a2d (patch) | |
| tree | cd04cb8a03e077a91511ed8d509a4e2e83588628 /util | |
| parent | db450adf9e7f6dbb96cddb15a8b929f367435981 (diff) | |
| parent | 37d1497aedaf666ed0a1c4d5eeb47c54b1efd98c (diff) | |
| download | prosody-ca622317f100d67023e2088179011eb61a243a2d.tar.gz prosody-ca622317f100d67023e2088179011eb61a243a2d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/sslconfig.lua | 3 | ||||
| -rw-r--r-- | util/throttle.lua | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/util/sslconfig.lua b/util/sslconfig.lua index 931502b9..4c4e1d48 100644 --- a/util/sslconfig.lua +++ b/util/sslconfig.lua @@ -63,6 +63,9 @@ function finalisers.ciphers(cipherlist) return cipherlist; end +-- Curve list too +finalisers.curveslist = finalisers.ciphers; + -- protocol = "x" should enable only that protocol -- protocol = "x+" should enable x and later versions diff --git a/util/throttle.lua b/util/throttle.lua index a8191886..1012f78a 100644 --- a/util/throttle.lua +++ b/util/throttle.lua @@ -1,7 +1,6 @@ local gettime = require "util.time".now local setmetatable = setmetatable; -local floor = math.floor; local _ENV = nil; |