Chromium Code Reviews| Index: webrtc/base/helpers.cc |
| diff --git a/webrtc/base/helpers.cc b/webrtc/base/helpers.cc |
| index 8e59b6410c580b1721a689aee33bc33d758983c6..f8b29b28f7176f2749484219c5c1383cc3f40895 100644 |
| --- a/webrtc/base/helpers.cc |
| +++ b/webrtc/base/helpers.cc |
| @@ -164,16 +164,18 @@ class TestRandomGenerator : public RandomGenerator { |
| int seed_; |
| }; |
| +namespace { |
| + |
| // TODO: Use Base64::Base64Table instead. |
| -static const char BASE64[64] = { |
| - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', |
| - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', |
| - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', |
| - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', |
| - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' |
| -}; |
| +static const char kBase64[64] = { |
| + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', |
| + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', |
| + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', |
| + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', |
| + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}; |
| -namespace { |
| +static const char kHex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', |
| + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; |
| // This round about way of creating a global RNG is to safe-guard against |
| // indeterminant static initialization order. |
| @@ -232,7 +234,7 @@ bool CreateRandomString(size_t len, |
| } |
| bool CreateRandomString(size_t len, std::string* str) { |
| - return CreateRandomString(len, BASE64, 64, str); |
| + return CreateRandomString(len, kBase64, 64, str); |
| } |
| bool CreateRandomString(size_t len, const std::string& table, |
| @@ -241,6 +243,41 @@ bool CreateRandomString(size_t len, const std::string& table, |
| static_cast<int>(table.size()), str); |
| } |
| +// Version 4 UUID is of the form: |
| +// xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx |
| +// Where 'x' is a hex digit, and 'y' is 8, 9, a or b. |
| +std::string CreateRandomUuid() { |
| + std::string str; |
| + scoped_ptr<uint8_t[]> bytes(new uint8_t[31]); |
| + if (!Rng().Generate(bytes.get(), 31)) { |
| + LOG(LS_ERROR) << "Failed to generate random string!"; |
| + return str; |
| + } |
| + str.reserve(36); |
| + for (size_t i = 0; i < 8; ++i) { |
| + str.push_back(kHex[bytes[i] % 16]); |
| + } |
| + str.push_back('-'); |
| + for (size_t i = 8; i < 12; ++i) { |
| + str.push_back(kHex[bytes[i] % 16]); |
| + } |
| + str.push_back('-'); |
| + str.push_back('4'); |
| + for (size_t i = 12; i < 15; ++i) { |
| + str.push_back(kHex[bytes[i] % 16]); |
| + } |
| + str.push_back('-'); |
| + str.push_back(kHex[((bytes[15] & ~0x4) | 0x8) % 16]); |
|
pthatcher1
2015/10/20 17:42:50
Could you make a table with 8, 9, a, and b and the
Taylor Brandstetter
2015/10/21 00:22:09
Done.
|
| + for (size_t i = 16; i < 19; ++i) { |
| + str.push_back(kHex[bytes[i] % 16]); |
| + } |
| + str.push_back('-'); |
| + for (size_t i = 19; i < 31; ++i) { |
| + str.push_back(kHex[bytes[i] % 16]); |
| + } |
| + return str; |
| +} |
| + |
| uint32_t CreateRandomId() { |
| uint32_t id; |
| if (!Rng().Generate(&id, sizeof(id))) { |