OLD | NEW |
---|---|
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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "native_client/src/untrusted/irt/irt.h" | 10 #include "native_client/src/untrusted/irt/irt.h" |
11 | 11 |
12 namespace { | 12 namespace { |
13 | 13 |
14 class NaclRandom { | 14 class NaclRandom { |
15 public: | 15 public: |
16 NaclRandom() { | 16 NaclRandom() { |
17 size_t result = nacl_interface_query(NACL_IRT_RANDOM_v0_1, | 17 const size_t result = |
18 &random_, sizeof(random_)); | 18 nacl_interface_query(NACL_IRT_RANDOM_v0_1, &random_, sizeof(random_)); |
19 CHECK_EQ(result, sizeof(random_)); | 19 CHECK_EQ(result, sizeof(random_)); |
20 } | 20 } |
21 | 21 |
22 ~NaclRandom() { | 22 ~NaclRandom() {} |
23 } | |
24 | 23 |
25 void GetRandomBytes(char* buffer, uint32_t num_bytes) { | 24 void GetRandomBytes(void* output, size_t num_bytes) { |
25 char* output_ptr = static_cast<char*>(output); | |
26 while (num_bytes > 0) { | 26 while (num_bytes > 0) { |
27 size_t nread; | 27 size_t nread; |
28 int error = random_.get_random_bytes(buffer, num_bytes, &nread); | 28 const int error = random_.get_random_bytes(output_ptr, num_bytes, &nread); |
29 CHECK_EQ(error, 0); | 29 CHECK_EQ(error, 0); |
30 CHECK_LE(nread, num_bytes); | 30 CHECK_LE(nread, num_bytes); |
31 buffer += nread; | 31 output_ptr += nread; |
32 num_bytes -= nread; | 32 num_bytes -= nread; |
33 } | 33 } |
34 } | 34 } |
35 | 35 |
36 private: | 36 private: |
37 nacl_irt_random random_; | 37 nacl_irt_random random_; |
38 }; | 38 }; |
39 | 39 |
40 base::LazyInstance<NaclRandom>::Leaky g_nacl_random = LAZY_INSTANCE_INITIALIZER; | 40 base::LazyInstance<NaclRandom>::Leaky g_nacl_random = LAZY_INSTANCE_INITIALIZER; |
41 | 41 |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 namespace base { | 44 namespace base { |
45 | 45 |
46 // NOTE: This function must be cryptographically secure. http://crbug.com/140076 | |
wtc
2014/01/22 22:29:09
This comment actually contradicts the comment for
DaleCurtis
2014/01/22 22:36:26
Are you okay with moving this comment into the ran
wtc
2014/01/22 22:47:12
I think this comment doesn't make sense. The purpo
DaleCurtis
2014/01/22 22:54:14
Heh, fair enough. All changes to it reverted.
| |
47 void RandBytes(void* output, size_t output_length) { | |
wtc
2014/01/22 22:29:09
RandBytes should be defined after RandUint64 to ma
DaleCurtis
2014/01/22 22:54:14
Done.
| |
48 g_nacl_random.Pointer()->GetRandomBytes(output, output_length); | |
49 } | |
50 | |
46 uint64 RandUint64() { | 51 uint64 RandUint64() { |
47 uint64 result; | 52 uint64 result; |
48 g_nacl_random.Pointer()->GetRandomBytes( | 53 g_nacl_random.Pointer()->GetRandomBytes(&result, sizeof(result)); |
49 reinterpret_cast<char*>(&result), sizeof(result)); | |
50 return result; | 54 return result; |
51 } | 55 } |
52 | 56 |
53 } // namespace base | 57 } // namespace base |
OLD | NEW |