diff options
| author | Kim Alvefur <zash@zash.se> | 2019-05-26 19:41:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-05-26 19:41:58 +0200 |
| commit | 31db616162d82f7a4dc5f7f496cd95c19cbd5918 (patch) | |
| tree | 11a618b505748faf115684e27aa45b2a622e80a9 /util | |
| parent | 5c927a37de1ce01b20970e5245959c1c41a85b3f (diff) | |
| parent | 069408d15861035e9da8052068c60939be938ab3 (diff) | |
| download | prosody-31db616162d82f7a4dc5f7f496cd95c19cbd5918.tar.gz prosody-31db616162d82f7a4dc5f7f496cd95c19cbd5918.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/random.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/util/random.lua b/util/random.lua index d8a84514..6782d7fa 100644 --- a/util/random.lua +++ b/util/random.lua @@ -12,7 +12,15 @@ if ok then return crand; end local urandom, urandom_err = io.open("/dev/urandom", "r"); local function bytes(n) - return urandom:read(n); + local data, err = urandom:read(n); + if not data then + if err then + error("Unable to retrieve data from secure random number generator (/dev/urandom): "..tostring(err)); + else + error("Secure random number generator (/dev/urandom) returned an end-of-file condition"); + end + end + return data; end if not urandom then |