From ac10a99e642c9005efc7639583fcb726acc169fd Mon Sep 17 00:00:00 2001
From: mread <qt-info@nokia.com>
Date: Wed, 24 Aug 2011 13:04:02 +0100
Subject: Giving QUuid::createUuid() more entropy on Symbian

QUuid::createUuid() uuids have low entropy on Symbian, giving a
dangerously high probability of collision. This change adds in more
entropy from the kernel tick count to reduce the possibility of
collision.

Task-number: QTBUG-21072
Reviewed-by: Sami Merila
---
 src/corelib/plugin/quuid.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index af63b79..83c6194 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -901,6 +901,12 @@ QUuid QUuid::createUuid()
             uint randNumber = 0;
             for (int filled = 0; filled < intbits; filled += randbits)
                 randNumber |= qrand()<<filled;
+#if defined(Q_OS_SYMBIAN)
+            // Symbian does not have /dev/urandom, so entropy is low.
+            // Add more entropy from the kernel tick count (1ms resolution).
+            // big multipler used to splatter the tick count bits over the whole 32 bits
+            randNumber ^= User::NTickCount() * 0x3b9aca07;
+#endif
             *(data+chunks) = randNumber;
         }
     }
-- 
cgit v0.12