cryptohome: Add stub functions to query PKCS11 set up status

service.h

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.

[Greg Spencer (Chromium), 2011/04/08 20:21:45]

Update Copyright.

[kmixter1, 2011/04/08 21:04:14]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef CRYPTOHOME_SERVICE_H_
 #define CRYPTOHOME_SERVICE_H_
 
 #include <base/logging.h>
 #include <base/scoped_ptr.h>
 #include <base/thread.h>
 #include <chromeos/dbus/abstract_dbus_service.h>
 #include <chromeos/dbus/dbus.h>
 #include <chromeos/dbus/service_constants.h>
 #include <chromeos/glib/object.h>
 #include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include "cryptohome_event_source.h"
 #include "mount.h"
 #include "mount_task.h"
+#include "pkcs11_init.h"
 #include "tpm_init.h"
 
 namespace cryptohome {
 namespace gobject {
 
 struct Cryptohome;
 }  // namespace gobject
 
 // Service
 // Provides a wrapper for exporting CryptohomeInterface to
@@ skipping 110 matching lines @@
   virtual gboolean AsyncDoAutomaticFreeDiskSpaceControl(gint *OUT_async_id,
                                                         GError **error);
 
   virtual gboolean TpmIsReady(gboolean* OUT_ready, GError** error);
   virtual gboolean TpmIsEnabled(gboolean* OUT_enabled, GError** error);
   virtual gboolean TpmGetPassword(gchar** OUT_password, GError** error);
   virtual gboolean TpmIsOwned(gboolean* OUT_owned, GError** error);
   virtual gboolean TpmIsBeingOwned(gboolean* OUT_owning, GError** error);
   virtual gboolean TpmCanAttemptOwnership(GError** error);
   virtual gboolean TpmClearStoredPassword(GError** error);
+
+  // Returns the label of the TPM token along with its SO and user PINs.
+  virtual gboolean Pkcs11GetTpmTokenInfo(gchar** OUT_label,
+                                         gchar** OUT_so_pin,
+                                         gchar** OUT_user_pin,
+                                         GError** error);
+
+  // Returns in |OUT_ready| whether the TPM token is ready for use.
+  virtual gboolean Pkcs11IsReady(gboolean* OUT_ready, GError** error);
   virtual gboolean GetStatusString(gchar** OUT_status, GError** error);
 
  protected:
   virtual GMainLoop *main_loop() { return loop_; }
 
   // Called periodically on Mount thread to initiate automatic disk
   // cleanup if needed.
   virtual void AutoCleanupCallback();
 
  private:
   GMainLoop *loop_;
   // Can't use scoped_ptr for cryptohome_ because memory is allocated by glib.
   gobject::Cryptohome *cryptohome_;
   chromeos::Blob system_salt_;
   scoped_ptr<cryptohome::Mount> default_mount_;
   cryptohome::Mount* mount_;
   scoped_ptr<TpmInit> default_tpm_init_;
   TpmInit *tpm_init_;
+  scoped_ptr<Pkcs11Init> default_pkcs11_init_;
+  Pkcs11Init *pkcs11_init_;
   bool initialize_tpm_;
   base::Thread mount_thread_;
   guint async_complete_signal_;
   guint tpm_init_signal_;
   CryptohomeEventSource event_source_;
   int auto_cleanup_period_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cryptohome
 
 #endif  // CRYPTOHOME_SERVICE_H_