TPM ownership code added to OOBE

BUG=chromium-os:3065
TEST=TPM password should appear in the "System security setting" of the EULA screen after TPM has been cleared and rebooted.

Review URL: http://codereview.chromium.org/3516020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61985 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index 13738ea..d9c9b4d 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -221,6 +221,14 @@ static GURL GetOemEulaPagePath() {
 }
 
 void EulaView::Init() {
+  // First, command to own the TPM.
+  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
+    chromeos::CryptohomeTpmCanAttemptOwnership();
+  } else {
+    LOG(ERROR) << "Cros library not loaded. "
+               << "We must have disabled the link that led here.";
+  }
+
   // Use rounded rect background.
   views::Painter* painter = CreateWizardPainter(
       &BorderDefinition::kScreenBorder);
@@ -364,14 +372,15 @@ void EulaView::LinkActivated(views::Link* source, int event_flags) {
     help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
   } else if (source == system_security_settings_link_) {
     // Pull the password from TPM.
-    std::string password;
-    if (!chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-      LOG(ERROR) << "Cros library not loaded. "
-                 << "We must have disabled the link that led here.";
-      return;
-    } else if (chromeos::CryptohomeTpmIsReady() &&
-               chromeos::CryptohomeTpmGetPassword(&password)) {
-      TpmInfoView* view = new TpmInfoView(ASCIIToWide(password));
+    bool password_acquired = false;
+    if (tpm_password_.empty() && chromeos::CryptohomeTpmIsReady()) {
+      // TODO(glotov): Sanitize memory used to store password when
+      // it's destroyed.
+      password_acquired = chromeos::CryptohomeTpmGetPassword(&tpm_password_);
+      chromeos::CryptohomeTpmClearStoredPassword();
+    }
+    if (!tpm_password_.empty() || password_acquired) {
+      TpmInfoView* view = new TpmInfoView(ASCIIToWide(tpm_password_));
       view->Init();
       views::Window* window = browser::CreateViewsWindow(
           GetNativeWindow(), gfx::Rect(), view);
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index 6487873..e7fc027 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -149,6 +149,11 @@ class EulaView
   // it will be deleted on bubble closing.
   MessageBubble* bubble_;
 
+  // TPM password local storage. By convention, we clear the password
+  // from TPM as soon as we read it. We store it here locally until
+  // EULA screen is closed.
+  std::string tpm_password_;
+
   DISALLOW_COPY_AND_ASSIGN(EulaView);
 };