Merge 0.10->trunk

[prosody.git] / util / uuid.lua

diff --git a/util/uuid.lua b/util/uuid.lua
index fc487c7283bcf4b3b364030faf28b28f25921fac..f4fd21f64ec72b9fc3e45f2973c9a1d9d9fabeff 100644 (file)
--- a/util/uuid.lua
+++ b/util/uuid.lua
@@ -6,45 +6,27 @@
 -- COPYING file in the source package for more information.
 --
 
+local random = require "util.random";
+local random_bytes = random.bytes;
+local hex = require "util.hex".to;
+local m_ceil = math.ceil;
 
-local m_random = math.random;
-local tostring = tostring;
-local os_time = os.time;
-local os_clock = os.clock;
-local sha1 = require "util.hashes".sha1;
-
-module "uuid"
-
-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 sha1(x..os_clock()..tostring({}), true);
-end
-
-local buffer = new_random(uniq_time());
-local function _seed(x)
-       buffer = new_random(buffer..x);
-end
 local function get_nibbles(n)
-       if #buffer < n then _seed(uniq_time()); end
-       local r = buffer:sub(0, n);
-       buffer = buffer:sub(n+1);
-       return r;
+       return hex(random_bytes(m_ceil(n/2))):sub(1, n);
 end
+
 local function get_twobits()
-       return ("%x"):format(get_nibbles(1):byte() % 4 + 8);
+       return ("%x"):format(random_bytes(1):byte() % 4 + 8);
 end
 
-function generate()
+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
-seed = _seed;
 
-return _M;
+return {
+       get_nibbles=get_nibbles;
+       generate = generate ;
+       -- COMPAT
+       seed = random.seed;
+};