Add additional status APIs for the TPM.

tpm_init.cc

 // Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Contains the implementation of class TpmInit
 
 #include "tpm_init.h"
 
 #include <base/logging.h>
 #include <base/time.h>
 
 #include "tpm.h"
 
 namespace tpm_init {
 
 // TpmInitTask is a private class used to handle asynchronous initialization of
 // the TPM.
 class TpmInitTask : public PlatformThread::Delegate {
  public:
   TpmInitTask();
   virtual ~TpmInitTask();
 
   void Init();
 
   virtual void ThreadMain();
 
   bool IsTpmReady();
   bool IsTpmEnabled();
+  bool IsTpmOwned();
+  bool IsTpmBeingOwned();
   bool GetTpmPassword(chromeos::Blob* password);
   long GetInitializationMillis();
   bool GetRandomData(int length, chromeos::Blob* data);
 
  private:
   scoped_ptr<tpm_init::Tpm> default_tpm_;
   tpm_init::Tpm* tpm_;
   bool initialize_status_;
   bool task_done_;
   long initialization_time_;
@@ skipping 20 matching lines @@
 }
 
 bool TpmInit::IsTpmReady() {
   return tpm_init_->IsTpmReady();
 }
 
 bool TpmInit::IsTpmEnabled() {
   return tpm_init_->IsTpmEnabled();
 }
 
+bool TpmInit::IsTpmOwned() {
+  return tpm_init_->IsTpmOwned();
+}
+
+bool TpmInit::IsTpmBeingOwned() {
+  return tpm_init_->IsTpmBeingOwned();
+}
+
 bool TpmInit::GetTpmPassword(chromeos::Blob* password) {
   return tpm_init_->GetTpmPassword(password);
 }
 
 long TpmInit::GetInitializationMillis() {
   return tpm_init_->GetInitializationMillis();
 }
 
 TpmInitTask::TpmInitTask()
     : default_tpm_(new tpm_init::Tpm()),
@@ skipping 36 matching lines @@
   // returned false.  That merely means that it did not successfully take
   // ownership, which is the common case after ownership is established on OOBE.
   // In that case, the TPM is ready if it is enabled and owned.
   return (tpm_->IsEnabled() && tpm_->IsOwned());
 }
 
 bool TpmInitTask::IsTpmEnabled() {
   return tpm_->IsEnabled();
 }
 
+bool TpmInitTask::IsTpmOwned() {
+  return tpm_->IsOwned();
+}
+
+bool TpmInitTask::IsTpmBeingOwned() {
+  return tpm_->IsBeingOwned();
+}
+
 bool TpmInitTask::GetTpmPassword(chromeos::Blob* password) {
   return tpm_->GetOwnerPassword(password);
 }
 
 long TpmInitTask::GetInitializationMillis() {
   return initialization_time_;
 }
 
 bool TpmInitTask::GetRandomData(int length, chromeos::Blob* data) {
   return tpm_->GetRandomData(length, data);
 }
 
 }  // namespace tpm_init