JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / wtf / RandomNumber.cpp

diff --git a/wtf/RandomNumber.cpp b/wtf/RandomNumber.cpp
index fc4826307a13c45549864d8ee22d67aa95658cb5..490c5914a72373c30f63df4f4127c4bb72133be6 100644 (file)
--- a/wtf/RandomNumber.cpp
+++ b/wtf/RandomNumber.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "RandomNumber.h"
 
 #include "config.h"
 #include "RandomNumber.h"
 

+#include "CryptographicallyRandomNumber.h"

 #include "RandomNumberSeed.h"
 
 #include <limits>
 #include "RandomNumberSeed.h"
 
 #include <limits>


@@ -34,9 +35,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <stdint.h>
 #include <stdlib.h>
 

-#if OS(WINCE)
+#if USE(MERSENNE_TWISTER_19937)

 extern "C" {
 extern "C" {

-#include "wince/mt19937ar.c"
+#include "mt19937ar.c"

 }
 #endif
 
 }
 #endif
 


@@ -44,79 +45,41 @@ extern "C" {
 #include <AEEAppGen.h>
 #include <AEESource.h>
 #include <AEEStdLib.h>
 #include <AEEAppGen.h>
 #include <AEESource.h>
 #include <AEEStdLib.h>

+#include <wtf/brew/RefPtrBrew.h>
+#include <wtf/brew/ShellBrew.h>

 #endif
 
 namespace WTF {
 
 #endif
 
 namespace WTF {
 

-double weakRandomNumber()
+double randomNumber()

 {
 {

-#if COMPILER(MSVC) && defined(_CRT_RAND_S)
-    // rand_s is incredibly slow on windows so we fall back on rand for Math.random
-    return (rand() + (rand() / (RAND_MAX + 1.0))) / (RAND_MAX + 1.0);
-#elif PLATFORM(BREWMP)
-    uint32_t bits;
-    GETRAND(reinterpret_cast<byte*>(&bits), sizeof(uint32_t));
+#if USE(OS_RANDOMNESS)
+    uint32_t bits = cryptographicallyRandomNumber();

     return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
 #else
     return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
 #else

-    return randomNumber();
-#endif
-}
+    // Without OS_RANDOMNESS, we fall back to other random number generators
+    // that might not be cryptographically secure. Ideally, most ports would
+    // define USE(OS_RANDOMNESS).

 
 

-double randomNumber()
-{
-#if !ENABLE(JSC_MULTIPLE_THREADS)
+#if !ENABLE(WTF_MULTIPLE_THREADS)

     static bool s_initialized = false;
     if (!s_initialized) {
         initializeRandomNumberGenerator();
         s_initialized = true;
     }
 #endif
     static bool s_initialized = false;
     if (!s_initialized) {
         initializeRandomNumberGenerator();
         s_initialized = true;
     }
 #endif

-    
-#if COMPILER(MSVC) && defined(_CRT_RAND_S)
-    uint32_t bits;
-    rand_s(&bits);
-    return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
-#elif OS(DARWIN)
-    uint32_t bits = arc4random();
-    return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
-#elif OS(UNIX)
-    uint32_t part1 = random() & (RAND_MAX - 1);
-    uint32_t part2 = random() & (RAND_MAX - 1);
-    // random only provides 31 bits
-    uint64_t fullRandom = part1;
-    fullRandom <<= 31;
-    fullRandom |= part2;

 
 

-    // Mask off the low 53bits
-    fullRandom &= (1LL << 53) - 1;
-    return static_cast<double>(fullRandom)/static_cast<double>(1LL << 53);
-#elif OS(WINCE)
+#if USE(MERSENNE_TWISTER_19937)

     return genrand_res53();
     return genrand_res53();

-#elif OS(WINDOWS)
-    uint32_t part1 = rand() & (RAND_MAX - 1);
-    uint32_t part2 = rand() & (RAND_MAX - 1);
-    uint32_t part3 = rand() & (RAND_MAX - 1);
-    uint32_t part4 = rand() & (RAND_MAX - 1);
-    // rand only provides 15 bits on Win32
-    uint64_t fullRandom = part1;
-    fullRandom <<= 15;
-    fullRandom |= part2;
-    fullRandom <<= 15;
-    fullRandom |= part3;
-    fullRandom <<= 15;
-    fullRandom |= part4;
-
-    // Mask off the low 53bits
-    fullRandom &= (1LL << 53) - 1;
-    return static_cast<double>(fullRandom)/static_cast<double>(1LL << 53);

 #elif PLATFORM(BREWMP)
     uint32_t bits;
 #elif PLATFORM(BREWMP)
     uint32_t bits;

-    ISource* randomSource;
-
-    IShell* shell = reinterpret_cast<AEEApplet*>(GETAPPINSTANCE())->m_pIShell;
-    ISHELL_CreateInstance(shell, AEECLSID_RANDOM, reinterpret_cast<void**>(&randomSource));
-    ISOURCE_Read(randomSource, reinterpret_cast<char*>(&bits), 4);
-    ISOURCE_Release(randomSource);
+    // Is this a cryptographically strong source of random numbers? If so, we
+    // should move this into OSRandomSource.
+    // http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp851.pdf
+    // is slightly unclear on this point, although it seems to imply that it is
+    // secure.
+    RefPtr<ISource> randomSource = createRefPtrInstance<ISource>(AEECLSID_RANDOM);
+    ISOURCE_Read(randomSource.get(), reinterpret_cast<char*>(&bits), 4);

 
     return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
 #else
 
     return static_cast<double>(bits) / (static_cast<double>(std::numeric_limits<uint32_t>::max()) + 1.0);
 #else


@@ -134,6 +97,7 @@ double randomNumber()
     fullRandom &= (1LL << 53) - 1;
     return static_cast<double>(fullRandom)/static_cast<double>(1LL << 53);
 #endif
     fullRandom &= (1LL << 53) - 1;
     return static_cast<double>(fullRandom)/static_cast<double>(1LL << 53);
 #endif

+#endif

 }
 
 }
 }
 
 }