| Index: rlz/lib/machine_id.cc
|
| diff --git a/rlz/lib/machine_id.cc b/rlz/lib/machine_id.cc
|
| deleted file mode 100644
|
| index b8c10f0ef320a321dda907429e094d67d091c487..0000000000000000000000000000000000000000
|
| --- a/rlz/lib/machine_id.cc
|
| +++ /dev/null
|
| @@ -1,84 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "rlz/lib/machine_id.h"
|
| -
|
| -#include "base/sha1.h"
|
| -#include "rlz/lib/assert.h"
|
| -#include "rlz/lib/crc8.h"
|
| -#include "rlz/lib/string_utils.h"
|
| -
|
| -namespace rlz_lib {
|
| -
|
| -bool GetMachineId(std::string* machine_id) {
|
| - if (!machine_id)
|
| - return false;
|
| -
|
| - static std::string calculated_id;
|
| - static bool calculated = false;
|
| - if (calculated) {
|
| - *machine_id = calculated_id;
|
| - return true;
|
| - }
|
| -
|
| - string16 sid_string;
|
| - int volume_id;
|
| - if (!GetRawMachineId(&sid_string, &volume_id))
|
| - return false;
|
| -
|
| - if (!testing::GetMachineIdImpl(sid_string, volume_id, machine_id))
|
| - return false;
|
| -
|
| - calculated = true;
|
| - calculated_id = *machine_id;
|
| - return true;
|
| -}
|
| -
|
| -namespace testing {
|
| -
|
| -bool GetMachineIdImpl(const string16& sid_string,
|
| - int volume_id,
|
| - std::string* machine_id) {
|
| - machine_id->clear();
|
| -
|
| - // The ID should be the SID hash + the Hard Drive SNo. + checksum byte.
|
| - static const int kSizeWithoutChecksum = base::kSHA1Length + sizeof(int);
|
| - std::basic_string<unsigned char> id_binary(kSizeWithoutChecksum + 1, 0);
|
| -
|
| - if (!sid_string.empty()) {
|
| - // In order to be compatible with the old version of RLZ, the hash of the
|
| - // SID must be done with all the original bytes from the unicode string.
|
| - // However, the chromebase SHA1 hash function takes only an std::string as
|
| - // input, so the unicode string needs to be converted to std::string
|
| - // "as is".
|
| - size_t byte_count = sid_string.size() * sizeof(string16::value_type);
|
| - const char* buffer = reinterpret_cast<const char*>(sid_string.c_str());
|
| - std::string sid_string_buffer(buffer, byte_count);
|
| -
|
| - // Note that digest can have embedded nulls.
|
| - std::string digest(base::SHA1HashString(sid_string_buffer));
|
| - VERIFY(digest.size() == base::kSHA1Length);
|
| - std::copy(digest.begin(), digest.end(), id_binary.begin());
|
| - }
|
| -
|
| - // Convert from int to binary (makes big-endian).
|
| - for (size_t i = 0; i < sizeof(int); i++) {
|
| - int shift_bits = 8 * (sizeof(int) - i - 1);
|
| - id_binary[base::kSHA1Length + i] = static_cast<unsigned char>(
|
| - (volume_id >> shift_bits) & 0xFF);
|
| - }
|
| -
|
| - // Append the checksum byte.
|
| - if (!sid_string.empty() || (0 != volume_id))
|
| - rlz_lib::Crc8::Generate(id_binary.c_str(),
|
| - kSizeWithoutChecksum,
|
| - &id_binary[kSizeWithoutChecksum]);
|
| -
|
| - return rlz_lib::BytesToString(
|
| - id_binary.c_str(), kSizeWithoutChecksum + 1, machine_id);
|
| -}
|
| -
|
| -} // namespace testing
|
| -
|
| -} // namespace rlz_lib
|
|
|