diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-23 01:44:16 +0200 |
commit | 19e5326754d02e3a35e14bbbf25ff1c8fed1098d (patch) | |
tree | 1e63192849a869212df2448f814cb37c91b04fe5 /util/random.lua | |
parent | dee8f7fde4d5e23c0139c2a7bc2871929c0df246 (diff) | |
parent | ad7e3d7233cff3e34c11323ff5ec64aacb8f678c (diff) | |
download | prosody-19e5326754d02e3a35e14bbbf25ff1c8fed1098d.tar.gz prosody-19e5326754d02e3a35e14bbbf25ff1c8fed1098d.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/random.lua')
-rw-r--r-- | util/random.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/random.lua b/util/random.lua index ed5cdf4b..5938a94f 100644 --- a/util/random.lua +++ b/util/random.lua @@ -10,7 +10,7 @@ local tostring = tostring; local os_time = os.time; local os_clock = os.clock; local ceil = math.ceil; -local sha1 = require "util.hashes".sha1; +local H = require "util.hashes".sha512; local last_uniq_time = 0; local function uniq_time() @@ -21,7 +21,7 @@ local function uniq_time() end local function new_random(x) - return sha1(x..os_clock()..tostring({})); + return H(x..os_clock()..tostring({})); end local buffer = new_random(uniq_time()); @@ -31,8 +31,8 @@ local function seed(x) end local function bytes(n) - if #buffer < n then seed(uniq_time()); end - local r = buffer:sub(0, n); + if #buffer < n+4 then seed(uniq_time()); end + local r = buffer:sub(1, n); buffer = buffer:sub(n+1); return r; end |