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

Unified Diff: base/rand_util.cc

Issue 6873156: Move crypto_helpers from sync to base (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Follow bbretw review Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/rand_util.h ('k') | base/rand_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/rand_util.cc
diff --git a/base/rand_util.cc b/base/rand_util.cc
index d89f8b725080d3912944b5b7bc60c19096c683ae..780b8bece965196f521278a7bdeb1a5428783c9a 100644
--- a/base/rand_util.cc
+++ b/base/rand_util.cc
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/string_util.h"
namespace base {
@@ -41,19 +42,19 @@ uint64 RandGenerator(uint64 max) {
return base::RandUint64() % max;
}
-std::string RandBytesAsString(size_t length) {
- const size_t kBitsPerChar = 8;
- const int kCharsPerInt64 = sizeof(uint64)/sizeof(char);
-
- std::string result(length, '\0');
- uint64 entropy = 0;
- for (size_t i = 0; i < result.size(); ++i) {
- if (i % kCharsPerInt64 == 0)
- entropy = RandUint64();
- result[i] = static_cast<char>(entropy);
- entropy >>= kBitsPerChar;
+void RandBytes(void* output, size_t output_length) {
+ uint64 random_int;
+ size_t random_int_size = sizeof(random_int);
+ for (size_t i = 0; i < output_length; i += random_int_size) {
+ random_int = base::RandUint64();
+ size_t copy_count = std::min(output_length - i, random_int_size);
+ memcpy(((uint8*)output) + i, &random_int, copy_count);
}
+}
+std::string RandBytesAsString(size_t length) {
+ std::string result;
+ RandBytes(WriteInto(&result, length + 1), length);
return result;
}
« no previous file with comments | « base/rand_util.h ('k') | base/rand_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698