| 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 "chromeos/cryptohome/system_salt_getter.h" | 5 #include "chromeos/cryptohome/system_salt_getter.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "chromeos/dbus/cryptohome_client.h" | 15 #include "chromeos/dbus/cryptohome_client.h" |
| 16 #include "chromeos/dbus/dbus_thread_manager.h" | 16 #include "chromeos/dbus/dbus_thread_manager.h" |
| 17 | 17 |
| 18 namespace chromeos { | 18 namespace chromeos { |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 SystemSaltGetter* g_system_salt_getter = NULL; | 21 SystemSaltGetter* g_system_salt_getter = NULL; |
| 22 | 22 |
| 23 } // namespace | 23 } // namespace |
| 24 | 24 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 } | 107 } |
| 108 | 108 |
| 109 // static | 109 // static |
| 110 std::string SystemSaltGetter::ConvertRawSaltToHexString( | 110 std::string SystemSaltGetter::ConvertRawSaltToHexString( |
| 111 const std::vector<uint8_t>& salt) { | 111 const std::vector<uint8_t>& salt) { |
| 112 return base::ToLowerASCII( | 112 return base::ToLowerASCII( |
| 113 base::HexEncode(reinterpret_cast<const void*>(salt.data()), salt.size())); | 113 base::HexEncode(reinterpret_cast<const void*>(salt.data()), salt.size())); |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace chromeos | 116 } // namespace chromeos |
| OLD | NEW |