Index: base/guid.cc |
diff --git a/base/guid.cc b/base/guid.cc |
index 99b037bcfae53d6ea3a89ddcf7a4bb42f33b7584..571407330c2bdf5459f9a6fc1e4b42bcb046557f 100644 |
--- a/base/guid.cc |
+++ b/base/guid.cc |
@@ -5,12 +5,21 @@ |
#include "base/guid.h" |
#include <stddef.h> |
+#include <stdint.h> |
+#include "base/rand_util.h" |
#include "base/strings/string_util.h" |
+#include "base/strings/stringprintf.h" |
namespace base { |
-bool IsValidGUID(const std::string& guid) { |
+namespace { |
+ |
+bool IsLowerHexDigit(char c) { |
+ return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f'); |
+} |
+ |
+bool IsValidGUIDInternal(const base::StringPiece& guid, bool strict) { |
const size_t kGUIDLength = 36U; |
if (guid.length() != kGUIDLength) |
return false; |
@@ -21,7 +30,7 @@ bool IsValidGUID(const std::string& guid) { |
if (current != '-') |
return false; |
} else { |
- if (!IsHexDigit(current)) |
+ if ((strict && !IsLowerHexDigit(current)) || !IsHexDigit(current)) |
return false; |
} |
} |
@@ -29,4 +38,42 @@ bool IsValidGUID(const std::string& guid) { |
return true; |
} |
+} // namespace |
+ |
+std::string GenerateGUID() { |
+ uint64_t sixteen_bytes[2] = {base::RandUint64(), base::RandUint64()}; |
+ |
+ // Set the GUID to version 4 as described in RFC 4122, section 4.4. |
+ // The format of GUID version 4 must be xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx, |
+ // where y is one of [8, 9, A, B]. |
+ |
+ // Clear the version bits and set the version to 4: |
+ sixteen_bytes[0] &= 0xffffffffffff0fffULL; |
+ sixteen_bytes[0] |= 0x0000000000004000ULL; |
+ |
+ // Set the two most significant bits (bits 6 and 7) of the |
+ // clock_seq_hi_and_reserved to zero and one, respectively: |
+ sixteen_bytes[1] &= 0x3fffffffffffffffULL; |
+ sixteen_bytes[1] |= 0x8000000000000000ULL; |
+ |
+ return RandomDataToGUIDString(sixteen_bytes); |
+} |
+ |
+bool IsValidGUID(const base::StringPiece& guid) { |
+ return IsValidGUIDInternal(guid, false /* strict */); |
+} |
+ |
+bool IsValidGUIDOutputString(const base::StringPiece& guid) { |
+ return IsValidGUIDInternal(guid, true /* strict */); |
+} |
+ |
+std::string RandomDataToGUIDString(const uint64_t bytes[2]) { |
+ return StringPrintf("%08x-%04x-%04x-%04x-%012llx", |
+ static_cast<unsigned int>(bytes[0] >> 32), |
+ static_cast<unsigned int>((bytes[0] >> 16) & 0x0000ffff), |
+ static_cast<unsigned int>(bytes[0] & 0x0000ffff), |
+ static_cast<unsigned int>(bytes[1] >> 48), |
+ bytes[1] & 0x0000ffffffffffffULL); |
+} |
+ |
} // namespace base |