Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: base/rand_util_nacl.cc

Issue 324983005: [PPAPI] Add browser tests for compositor API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor_api_impl_new
Patch Set: Update Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/DEPS ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/rand_util.h" 5 #include "base/rand_util.h"
6 6
7 #include <nacl/nacl_random.h>
Peng 2014/06/17 19:14:46 Please ignore changes in base folder. It is a temp
8
7 #include "base/basictypes.h" 9 #include "base/basictypes.h"
8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "native_client/src/untrusted/irt/irt.h"
11 11
12 namespace { 12 namespace {
13 13
14 class NaclRandom { 14 int i = 0;
15 public:
16 NaclRandom() {
17 const size_t result =
18 nacl_interface_query(NACL_IRT_RANDOM_v0_1, &random_, sizeof(random_));
19 CHECK_EQ(result, sizeof(random_));
20 }
21 15
22 ~NaclRandom() {} 16 void GetRandomBytes(void* output, size_t num_bytes) {
23 17 if (nacl_secure_random_init() == 0) {
24 void GetRandomBytes(void* output, size_t num_bytes) {
25 char* output_ptr = static_cast<char*>(output); 18 char* output_ptr = static_cast<char*>(output);
26 while (num_bytes > 0) { 19 while (num_bytes > 0) {
27 size_t nread; 20 size_t nread;
28 const int error = random_.get_random_bytes(output_ptr, num_bytes, &nread); 21 const int error = nacl_secure_random(output_ptr, num_bytes, &nread);
29 CHECK_EQ(error, 0); 22 CHECK_EQ(error, 0);
30 CHECK_LE(nread, num_bytes); 23 CHECK_LE(nread, num_bytes);
31 output_ptr += nread; 24 output_ptr += nread;
32 num_bytes -= nread; 25 num_bytes -= nread;
33 } 26 }
27 } else {
28 char* output_ptr = static_cast<char*>(output);
29 while (num_bytes > 0) {
30 int r = (++i) + reinterpret_cast<int>(output_ptr);
31 while (r >= 255) {
32 r = r + ( r >> 8);
33 }
34 *output_ptr++ = r;
35 num_bytes--;
36 }
34 } 37 }
35 38 }
36 private:
37 nacl_irt_random random_;
38 };
39
40 base::LazyInstance<NaclRandom>::Leaky g_nacl_random = LAZY_INSTANCE_INITIALIZER;
41 39
42 } // namespace 40 } // namespace
43 41
44 namespace base { 42 namespace base {
45 43
46 // NOTE: This function must be cryptographically secure. http://crbug.com/140076 44 // NOTE: This function must be cryptographically secure. http://crbug.com/140076
47 uint64 RandUint64() { 45 uint64 RandUint64() {
48 uint64 result; 46 uint64 result;
49 g_nacl_random.Pointer()->GetRandomBytes(&result, sizeof(result)); 47 GetRandomBytes(&result, sizeof(result));
50 return result; 48 return result;
51 } 49 }
52 50
53 void RandBytes(void* output, size_t output_length) { 51 void RandBytes(void* output, size_t output_length) {
54 g_nacl_random.Pointer()->GetRandomBytes(output, output_length); 52 GetRandomBytes(output, output_length);
55 } 53 }
56 54
57 } // namespace base 55 } // namespace base
OLDNEW
« no previous file with comments | « base/DEPS ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698