Removes trailing spaces. Removes tabs.

[vlc] / src / misc / rand.c

diff --git a/src/misc/rand.c b/src/misc/rand.c
index 0caa83a99a5a64b51ea818e0462dfff01450edf4..de3cb062588b656d27ac727319f15f1b92e19cbf 100644 (file)
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -116,27 +116,43 @@ void vlc_rand_bytes (void *buf, size_t len)
 }
 
 #else /* WIN32 */
-/* It would be better to use rand_s() instead of rand() but it's not possible 
- * while we support Win 2OOO and until it gets included in mingw */
-/* #define _CRT_RAND_S*/
-#include <stdlib.h>
+
+#include <wincrypt.h>
 
 void vlc_rand_bytes (void *buf, size_t len)
 {
-    while (len > 0)
+    HCRYPTPROV hProv;
+    size_t count = len;
+    uint8_t *p_buf = (uint8_t *)buf;
+
+    /* fill buffer with pseudo-random data */
+    while (count > 0)
     {
         unsigned int val;
-        /*rand_s (&val);*/
         val = rand();
-
-        if (len < sizeof (val))
+        if (count < sizeof (val))
         {
-            memcpy (buf, &val, len);
+            memcpy (p_buf, &val, count);
             break;
         }
+ 
+        memcpy (p_buf, &val, sizeof (val));
+        count -= sizeof (val);
+        p_buf += sizeof (val);
+    }
 
-        memcpy (buf, &val, sizeof (val));
-        len -= sizeof (val);
+    /* acquire default encryption context */
+    if( CryptAcquireContext(
+        &hProv,            // Variable to hold returned handle.
+        NULL,              // Use default key container.
+        MS_DEF_PROV,       // Use default CSP.
+        PROV_RSA_FULL,     // Type of provider to acquire.
+        0) )
+    {
+        /* fill buffer with pseudo-random data, intial buffer content
+           is used as auxillary random seed */
+        CryptGenRandom(hProv, len, buf);
+        CryptReleaseContext(hProv, 0);
     }
 }
 #endif