Software /
code /
verse
Changeset
401:7be4ebefd1f4
util.random: Use /dev/urandom or LuaCrypto
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 13 Jan 2016 00:45:54 +0100 |
parents | 399:82ad158714e5 |
children | 402:81b109281879 |
files | util/random.lua |
diffstat | 1 files changed, 8 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/util/random.lua Tue Jan 12 13:14:36 2016 +0000 +++ b/util/random.lua Wed Jan 13 00:45:54 2016 +0100 @@ -6,38 +6,14 @@ -- COPYING file in the source package for more information. -- -local tostring = tostring; -local os_time = os.time; -local os_clock = os.clock; -local ceil = math.ceil; -local H = require "util.hashes".sha1; +local urandom = io.open("/dev/urandom", "r"); -local last_uniq_time = 0; -local function uniq_time() - local new_uniq_time = os_time(); - if last_uniq_time >= new_uniq_time then new_uniq_time = last_uniq_time + 1; end - last_uniq_time = new_uniq_time; - return new_uniq_time; -end - -local function new_random(x) - return H(x..os_clock()..tostring({})); +if urandom then + return { + seed = function () end; + bytes = function (n) return urandom:read(n); end + }; end -local buffer = new_random(uniq_time()); - -local function seed(x) - buffer = new_random(buffer..x); -end - -local function bytes(n) - if #buffer < n+4 then seed(uniq_time()); end - local r = buffer:sub(1, n); - buffer = buffer:sub(n+1); - return r; -end - -return { - seed = seed; - bytes = bytes; -}; +local crypto = require "crypto" +return crypto.rand;