Chromium Code Reviews| Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
| diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
| index aa24dae249c0d9906d624cf5ea502570b0b6fa16..16c26cad98f20872b09383e51dc8917e0724d152 100644 |
| --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
| +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
| @@ -25,6 +25,8 @@ |
| #if defined(OS_CHROMEOS) |
| #include "chrome/browser/chromeos/chromeos_utils.h" |
| +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" |
| +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" |
| #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" |
| #include "components/user_manager/user.h" |
| #include "components/user_manager/user_manager.h" |
| @@ -608,8 +610,20 @@ bool EasyUnlockPrivateGetSignInChallengeFunction::RunAsync() { |
| Profile* profile = Profile::FromBrowserContext(browser_context()); |
| const std::string challenge = |
| EasyUnlockService::Get(profile)->GetChallenge(); |
| - // TODO(tbarzic): Implement nonce signing. |
| - OnDone(challenge, std::string() /* signed_nonce */); |
| + if (!challenge.empty() && !params->nonce.empty()) { |
| + EasyUnlockTpmKeyManager* key_manager = |
| + EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile); |
| + if (!key_manager) |
| + return false; |
|
xiyuan
2014/12/02 23:15:58
nit: SetError('No EasyUnlockTpmKeyManager.') befor
tbarzic
2014/12/03 19:10:28
Done.
|
| + key_manager->SignUsingTpmKey( |
| + EasyUnlockService::Get(profile)->GetUserEmail(), |
| + params->nonce, |
| + base::Bind(&EasyUnlockPrivateGetSignInChallengeFunction::OnDone, |
| + this, |
| + challenge)); |
| + } else { |
| + OnDone(challenge, std::string()); |
| + } |
| return true; |
| } |