Merge 0.9->0.10

[prosody.git] / util / uuid.lua

diff --git a/util/uuid.lua b/util/uuid.lua
index 3576be8fa2bfbe39f57985f5c33c987fb0341186..f4fd21f64ec72b9fc3e45f2973c9a1d9d9fabeff 100644 (file)
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -1,36 +1,32 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
-local error = error;
-local round_up = math.ceil;
-local urandom, urandom_err = io.open("/dev/urandom", "r");
-
-module "uuid"
+local random = require "util.random";
+local random_bytes = random.bytes;
+local hex = require "util.hex".to;
+local m_ceil = math.ceil;
 
 local function get_nibbles(n)
-       local binary_random = urandom:read(round_up(n/2));
-       local hex_random = binary_random:gsub(".",
-               function (x) return ("%02x"):format(x:byte()) end);
-       return hex_random:sub(1, n);
+       return hex(random_bytes(m_ceil(n/2))):sub(1, n);
 end
+
 local function get_twobits()
-       return ("%x"):format(urandom:read(1):byte() % 4 + 8);
+       return ("%x"):format(random_bytes(1):byte() % 4 + 8);
 end
 
-function generate()
-       if not urandom then
-               error("Unable to obtain a secure random number generator, please see https://prosody.im/doc/random ("..urandom_err..")");
-       end
+local function generate()
        -- generate RFC 4122 complaint UUIDs (version 4 - random)
        return get_nibbles(8).."-"..get_nibbles(4).."-4"..get_nibbles(3).."-"..(get_twobits())..get_nibbles(3).."-"..get_nibbles(12);
 end
 
-function seed()
-end
-
-return _M;
+return {
+       get_nibbles=get_nibbles;
+       generate = generate ;
+       -- COMPAT
+       seed = random.seed;
+};