Chromium Code Reviews| 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 <nacl/nacl_random.h> | 7 #include <nacl/nacl_random.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 | 11 |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 int i = 0; | |
| 15 | |
| 14 void GetRandomBytes(void* output, size_t num_bytes) { | 16 void GetRandomBytes(void* output, size_t num_bytes) { |
| 15 CHECK_EQ(0, nacl_secure_random_init()); | 17 if (nacl_secure_random_init() == 0) { |
| 16 char* output_ptr = static_cast<char*>(output); | 18 char* output_ptr = static_cast<char*>(output); |
| 17 while (num_bytes > 0) { | 19 while (num_bytes > 0) { |
| 18 size_t nread; | 20 size_t nread; |
| 19 const int error = nacl_secure_random(output_ptr, num_bytes, &nread); | 21 const int error = nacl_secure_random(output_ptr, num_bytes, &nread); |
| 20 CHECK_EQ(error, 0); | 22 CHECK_EQ(error, 0); |
| 21 CHECK_LE(nread, num_bytes); | 23 CHECK_LE(nread, num_bytes); |
| 22 output_ptr += nread; | 24 output_ptr += nread; |
| 23 num_bytes -= nread; | 25 num_bytes -= nread; |
| 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++ = static_cast<char>(r); | |
| 35 num_bytes--; | |
| 36 } | |
|
raymes
2014/06/18 05:58:44
I'm not sure that adding this is the right thing t
Peng
2014/06/18 11:14:36
Please ignore changes in base folder. It is a temp
| |
| 24 } | 37 } |
| 25 } | 38 } |
| 26 | 39 |
| 27 } // namespace | 40 } // namespace |
| 28 | 41 |
| 29 namespace base { | 42 namespace base { |
| 30 | 43 |
| 31 // NOTE: This function must be cryptographically secure. http://crbug.com/140076 | 44 // NOTE: This function must be cryptographically secure. http://crbug.com/140076 |
| 32 uint64 RandUint64() { | 45 uint64 RandUint64() { |
| 33 uint64 result; | 46 uint64 result; |
| 34 GetRandomBytes(&result, sizeof(result)); | 47 GetRandomBytes(&result, sizeof(result)); |
| 35 return result; | 48 return result; |
| 36 } | 49 } |
| 37 | 50 |
| 38 void RandBytes(void* output, size_t output_length) { | 51 void RandBytes(void* output, size_t output_length) { |
| 39 GetRandomBytes(output, output_length); | 52 GetRandomBytes(output, output_length); |
| 40 } | 53 } |
| 41 | 54 |
| 42 } // namespace base | 55 } // namespace base |
| OLD | NEW |