cryptohome: Add stub functions to query PKCS11 set up status

service.cc

-// Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #include "service.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <base/file_util.h>
 #include <base/logging.h>
@@ skipping 62 matching lines @@
 };
 
 Service::Service()
     : loop_(NULL),
       cryptohome_(NULL),
       system_salt_(),
       default_mount_(new cryptohome::Mount()),
       mount_(default_mount_.get()),
       default_tpm_init_(new TpmInit()),
       tpm_init_(default_tpm_init_.get()),
+      default_pkcs11_init_(new Pkcs11Init()),

[gauravsh, 2011/04/08 21:37:35]

pkcs11_init_ is just a helper pointer to avoid saying default_pkcs11_init.get()
each time you need to use Pkcs11Init? 

[kmixter1, 2011/04/08 21:56:39]

Just mimicking tpm_init_ here.  I suspect Fes/Will's intention was to make it
easy to gmock out these via dependency injection, but no one is doing that in
either case yet.

+      pkcs11_init_(default_pkcs11_init_.get()),
       initialize_tpm_(true),
       mount_thread_(kMountThreadName),
       async_complete_signal_(-1),
       tpm_init_signal_(-1),
       event_source_(),
       auto_cleanup_period_(kAutoCleanupPeriodMS) {
 }
 
 Service::~Service() {
   if (loop_)
@@ skipping 466 matching lines @@
     tpm_init_->StartInitializeTpm();
   }
   return TRUE;
 }
 
 gboolean Service::TpmClearStoredPassword(GError** error) {
   tpm_init_->ClearStoredTpmPassword();
   return TRUE;
 }
 
+gboolean Service::Pkcs11IsReady(gboolean* OUT_ready, GError** error) {
+  // TODO(kmixter/gauravsh): Base this on PKCS#11 really being initialized.
+  *OUT_ready = TRUE;
+  return TRUE;
+}
+
+gboolean Service::Pkcs11GetTpmTokenInfo(gchar** OUT_label,
+                                        gchar** OUT_user_pin,
+                                        GError** error) {
+  pkcs11_init_->GetTpmTokenInfo(OUT_label,
+                                OUT_user_pin);
+  return TRUE;
+}
+
 gboolean Service::GetStatusString(gchar** OUT_status, GError** error) {
   Tpm::TpmStatusInfo tpm_status;
   mount_->get_crypto()->EnsureTpm(false);
   Tpm* tpm = const_cast<Tpm*>(mount_->get_crypto()->get_tpm());
 
   if (tpm) {
     tpm->GetStatus(true, &tpm_status);
   } else {
     Tpm::GetSingleton()->GetStatus(true, &tpm_status);
   }
@@ skipping 92 matching lines @@
       FROM_HERE, NewRunnableMethod(this, &Service::AutoCleanupCallback),
       auto_cleanup_period_);
 }
 
 }  // namespace cryptohome
 
 // We do not want AutoCleanupCallback() to refer the class and make it
 // wait for its execution.  If Mount thread terminates, it will delete
 // our pending task or wait for it to finish.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(cryptohome::Service);