Use nacl_secure_random() in rand_util_nacl.cc

base/rand_util_nacl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/rand_util.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "native_client/src/untrusted/irt/irt.h"
+#include "native_client/src/untrusted/nacl/nacl_random.h"

[Mark Seaborn, 2014/06/16 23:47:38]

I think it should work to #include this with:
#include <nacl/nacl_random.h>
Does that work?

[Peng, 2014/06/16 23:57:26]

It works. Done

 
 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_));
+    int rv = nacl_secure_random_init();

[Mark Seaborn, 2014/06/16 23:39:25]

nacl_secure_random_init() is idempotent so you can actually simplify this by
just having a top-level function that does:

void GetRandomBytes(void* output, size_t num_bytes) {
  CHECK_EQ(0, nacl_secure_random_init());
  const int error = nacl_secure_random(...);
  ...
}

Then the use of LazyInstance can go away.

(I will simplify this on the NaCl side so that calling nacl_secure_random_init()
isn't needed at all.)

[Peng, 2014/06/16 23:57:26]

Done.

+    CHECK_EQ(rv, 0);
   }
 
   ~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);
+      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
 
 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));
   return result;
 }
 
 void RandBytes(void* output, size_t output_length) {
   g_nacl_random.Pointer()->GetRandomBytes(output, output_length);
 }
 
 }  // namespace base