Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc |
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc |
index b78d96df100dbba873005769fe805a18e046740e..6c47ed7edbd4abd2f82cd83999c74a79e02474ed 100644 |
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc |
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc |
@@ -35,35 +35,6 @@ const int kEasyUnlockKeyRevision = 1; |
const int kEasyUnlockKeyPrivileges = |
cryptohome::PRIV_MOUNT | cryptohome::PRIV_ADD | cryptohome::PRIV_REMOVE; |
-// TODO(xiyuan): Use real keys. http://crbug.com/409027 |
-const char kTpmPubKey[] = { |
- 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, |
- 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, |
- 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xdc, 0xfa, 0x10, |
- 0xff, 0xa7, 0x46, 0x65, 0xae, 0xef, 0x87, 0x09, 0x74, 0xea, 0x99, 0xb2, |
- 0xce, 0x54, 0x54, 0x7c, 0x67, 0xf4, 0x2a, 0xaa, 0x6d, 0xd0, 0x1a, 0x2e, |
- 0xd3, 0x1f, 0xd2, 0xc2, 0x42, 0xaf, 0x5d, 0x96, 0x0b, 0x1f, 0x89, 0x6e, |
- 0xfb, 0xa3, 0x54, 0x3d, 0x65, 0x54, 0xb7, 0xb1, 0x26, 0x87, 0xa5, 0xc6, |
- 0x88, 0x56, 0x8f, 0x32, 0xe0, 0x26, 0xc5, 0x32, 0xd2, 0x59, 0x93, 0xb9, |
- 0x7a, 0x7c, 0x28, 0x42, 0xec, 0x2b, 0x8e, 0x12, 0x35, 0xee, 0xe2, 0x41, |
- 0x4d, 0x25, 0x80, 0x6c, 0x6f, 0xba, 0xe4, 0x38, 0x95, 0x4e, 0xba, 0x9d, |
- 0x27, 0x55, 0xdf, 0xfe, 0xeb, 0x1b, 0x47, 0x70, 0x09, 0x57, 0x81, 0x5a, |
- 0x8a, 0x23, 0x3f, 0x97, 0xb1, 0xa2, 0xc7, 0x14, 0xb3, 0xe2, 0xbe, 0x2e, |
- 0x42, 0xd8, 0xbe, 0x30, 0xb1, 0x96, 0x15, 0x82, 0xea, 0x99, 0x48, 0x91, |
- 0x0e, 0x0c, 0x79, 0x7c, 0x50, 0xfc, 0x4b, 0xb4, 0x55, 0xf0, 0xfc, 0x45, |
- 0xe5, 0xe3, 0x4e, 0x63, 0x96, 0xac, 0x5b, 0x2d, 0x46, 0x23, 0x93, 0x65, |
- 0xc7, 0xf3, 0xda, 0xaf, 0x09, 0x09, 0x40, 0x0d, 0x61, 0xcf, 0x9e, 0x0c, |
- 0xa8, 0x08, 0x3e, 0xaf, 0x33, 0x5a, 0x6f, 0xce, 0xb6, 0x86, 0x3c, 0x1c, |
- 0xc0, 0xcf, 0x5a, 0x17, 0x1a, 0xff, 0x35, 0xd9, 0x7e, 0xcb, 0x60, 0xef, |
- 0x25, 0x1c, 0x7e, 0xc2, 0xc8, 0xa5, 0x88, 0x36, 0x1d, 0xc4, 0x12, 0x66, |
- 0xa4, 0xb7, 0xed, 0x38, 0xb0, 0x26, 0xce, 0x0d, 0x53, 0x78, 0x64, 0x49, |
- 0xdb, 0xb1, 0x1a, 0x06, 0xea, 0x33, 0xcc, 0xf1, 0xec, 0xa5, 0x75, 0x20, |
- 0x1e, 0xd1, 0xaa, 0x47, 0x3e, 0xd1, 0x18, 0x7e, 0xc1, 0xd8, 0xa7, 0x44, |
- 0xea, 0x34, 0x5b, 0xed, 0x7e, 0xa0, 0x0e, 0xe4, 0xe8, 0x1b, 0xba, 0x46, |
- 0x48, 0x60, 0x1d, 0xd5, 0x37, 0xdc, 0x91, 0x01, 0x5d, 0x31, 0xf0, 0xc2, |
- 0xc1, 0x02, 0x03, 0x01, 0x00, 0x01 |
-}; |
- |
} // namespace |
///////////////////////////////////////////////////////////////////////////// |
@@ -262,9 +233,11 @@ void EasyUnlockCreateKeysOperation::ChallengeCreator::OnChallengeGenerated( |
EasyUnlockCreateKeysOperation::EasyUnlockCreateKeysOperation( |
const UserContext& user_context, |
+ const std::string& tpm_public_key, |
const EasyUnlockDeviceKeyDataList& devices, |
const CreateKeysCallback& callback) |
: user_context_(user_context), |
+ tpm_public_key_(tpm_public_key), |
devices_(devices), |
callback_(callback), |
key_creation_index_(0), |
@@ -318,7 +291,7 @@ void EasyUnlockCreateKeysOperation::CreateKeyForDeviceAtIndex(size_t index) { |
challenge_creator_.reset(new ChallengeCreator( |
user_key, |
raw_session_key, |
- std::string(kTpmPubKey, arraysize(kTpmPubKey)), |
+ tpm_public_key_, |
device, |
base::Bind(&EasyUnlockCreateKeysOperation::OnChallengeCreated, |
weak_ptr_factory_.GetWeakPtr(), |