Use nacl_secure_random() in rand_util_nacl.cc

base/rand_util_nacl.cc

Index: base/rand_util_nacl.cc
diff --git a/base/rand_util_nacl.cc b/base/rand_util_nacl.cc
index f9751217326b4c72730b98fa1018be49f12a4b1a..a8ea202fc7edde189c612969cad9bde5b13af0eb 100644
--- a/base/rand_util_nacl.cc
+++ b/base/rand_util_nacl.cc
@@ -4,40 +4,25 @@
 
 #include "base/rand_util.h"
 
+#include <nacl/nacl_random.h>
+
 #include "base/basictypes.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "native_client/src/untrusted/irt/irt.h"
 
 namespace {
 
-class NaclRandom {
- public:
-  NaclRandom() {
-    const size_t result =
-        nacl_interface_query(NACL_IRT_RANDOM_v0_1, &random_, sizeof(random_));
-    CHECK_EQ(result, sizeof(random_));
-  }
-
-  ~NaclRandom() {}
-
-  void GetRandomBytes(void* output, size_t num_bytes) {
-    char* output_ptr = static_cast<char*>(output);
-    while (num_bytes > 0) {
-      size_t nread;
-      const int error = random_.get_random_bytes(output_ptr, num_bytes, &nread);
-      CHECK_EQ(error, 0);
-      CHECK_LE(nread, num_bytes);
-      output_ptr += nread;
-      num_bytes -= nread;
-    }
+void GetRandomBytes(void* output, size_t num_bytes) {
+  CHECK_EQ(0, nacl_secure_random_init());
+  char* output_ptr = static_cast<char*>(output);
+  while (num_bytes > 0) {
+    size_t nread;
+    const int error = nacl_secure_random(output_ptr, num_bytes, &nread);
+    CHECK_EQ(error, 0);
+    CHECK_LE(nread, num_bytes);
+    output_ptr += nread;
+    num_bytes -= nread;
   }
-
- private:
-  nacl_irt_random random_;
-};
-
-base::LazyInstance<NaclRandom>::Leaky g_nacl_random = LAZY_INSTANCE_INITIALIZER;
+}
 
 }  // namespace
 
@@ -46,12 +31,12 @@ namespace base {
 // NOTE: This function must be cryptographically secure. http://crbug.com/140076
 uint64 RandUint64() {
   uint64 result;
-  g_nacl_random.Pointer()->GetRandomBytes(&result, sizeof(result));
+  GetRandomBytes(&result, sizeof(result));
   return result;
 }
 
 void RandBytes(void* output, size_t output_length) {
-  g_nacl_random.Pointer()->GetRandomBytes(output, output_length);
+  GetRandomBytes(output, output_length);
 }
 
 }  // namespace base