service,cryptohome: wire up lockbox to dbus

service.h

 // Copyright (c) 2009 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.
 #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 "lockbox.h"

[gauravsh, 2011/04/11 04:03:20]

nit: alpha

 #include "tpm_init.h"
 
 namespace cryptohome {
 namespace gobject {
 
 struct Cryptohome;
 }  // namespace gobject
 
 // Service
 // Provides a wrapper for exporting CryptohomeInterface to
 // D-Bus and entering the glib run loop.
 //
 // ::g_type_init() must be called before this class is used.
 class Service : public chromeos::dbus::AbstractDbusService,
                 public MountTaskObserver,
                 public CryptohomeEventSourceSink,
                 public TpmInit::TpmInitCallback {
  public:
   Service();
   virtual ~Service();
 
   // From chromeos::dbus::AbstractDbusService
   // Setup the wrapped GObject and the GMainLoop
   virtual bool Initialize();
   virtual bool SeedUrandom();
+  virtual void InitializeLockbox();
   virtual bool Reset();
 
   // Used internally during registration to set the
   // proper service information.
   virtual const char *service_name() const {
     return kCryptohomeServiceName;
   }
   virtual const char *service_path() const {
     return kCryptohomeServicePath;
   }
   virtual const char *service_interface() const {
     return kCryptohomeInterface;
   }
   virtual GObject* service_object() const {
     return G_OBJECT(cryptohome_);
   }
   virtual void set_mount(Mount* mount) {
     mount_ = mount;
   }
   virtual void set_tpm_init(TpmInit* tpm_init) {
     tpm_init_ = tpm_init;
   }
   virtual void set_initialize_tpm(bool value) {
     initialize_tpm_ = value;
   }
   virtual void set_auto_cleanup_period(int value) {
     auto_cleanup_period_ = value;
   }
-
+  virtual void set_lockbox(Lockbox* lockbox) {
+    lockbox_ = lockbox;
+  }
 
   // MountTaskObserver
   virtual void MountTaskObserve(const MountTaskResult& result);
 
   // CryptohomeEventSourceSink
   virtual void NotifyEvent(CryptohomeEventBase* event);
 
   // TpmInitCallback
   virtual void InitializeTpmComplete(bool status, bool took_ownership);
 
@@ skipping 58 matching lines @@
 
   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);
   virtual gboolean GetStatusString(gchar** OUT_status, GError** error);
 
+  // Lockbox methods
+  virtual gboolean LockboxGet(gchar* name,
+                              GArray** OUT_value,
+                              gboolean* OUT_successful,
+                              GError** error);
+  virtual gboolean LockboxSet(gchar* name,
+                              GArray* value,
+                              gboolean* OUT_successful,
+                              GError** error);
+  virtual gboolean LockboxLock(gboolean* OUT_locked, GError** error);
+  virtual gboolean LockboxCount(gint* OUT_count, GError** error);
+  virtual gboolean LockboxIsReady(gboolean* OUT_ready, GError** error);
+  virtual gboolean LockboxIsLocked(gboolean* OUT_locked, GError** error);
+  virtual gboolean LockboxIsSecure(gboolean* OUT_secure, GError** error);
+  virtual gboolean LockboxIsTampered(gboolean* OUT_tampered, GError** error);
+  virtual gboolean LockboxIsLegacy(gboolean* OUT_legacy, 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_;
   bool initialize_tpm_;
   base::Thread mount_thread_;
   guint async_complete_signal_;
   guint tpm_init_signal_;
   CryptohomeEventSource event_source_;
   int auto_cleanup_period_;
+  scoped_ptr<cryptohome::Lockbox> default_lockbox_;
+  cryptohome::Lockbox *lockbox_;

[gauravsh, 2011/04/11 04:03:20]

nit: * next to the type.

 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cryptohome
 
 #endif  // CRYPTOHOME_SERVICE_H_