| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 #ifndef CRYPTOHOME_INTERFACE_H_ | 4 #ifndef CRYPTOHOME_INTERFACE_H_ |
| 5 #define CRYPTOHOME_INTERFACE_H_ | 5 #define CRYPTOHOME_INTERFACE_H_ |
| 6 | 6 |
| 7 #include <dbus/dbus-glib.h> | |
| 8 #include <dbus/dbus-glib-bindings.h> | |
| 9 #include <glib-object.h> | |
| 10 #include <stdlib.h> | 7 #include <stdlib.h> |
| 11 | 8 |
| 12 #include <base/logging.h> | 9 #include <base/logging.h> |
| 13 #include <chromeos/dbus/dbus.h> | 10 #include <chromeos/dbus/dbus.h> |
| 14 #include <chromeos/glib/object.h> | 11 #include <chromeos/glib/object.h> |
| 12 #include <dbus/dbus-glib.h> |
| 13 #include <dbus/dbus-glib-bindings.h> |
| 14 #include <glib-object.h> |
| 15 | 15 |
| 16 #include "cryptohome/service.h" | 16 #include "service.h" |
| 17 | 17 |
| 18 // Helpers for using GObjects until we can get a C++ wrapper going. | 18 // Helpers for using GObjects until we can get a C++ wrapper going. |
| 19 namespace cryptohome { | 19 namespace cryptohome { |
| 20 namespace gobject { // Namespace hiding the GObject type data. | 20 namespace gobject { // Namespace hiding the GObject type data. |
| 21 | 21 |
| 22 struct Cryptohome { | 22 struct Cryptohome { |
| 23 GObject parent_instance; | 23 GObject parent_instance; |
| 24 Service *service; // pointer to implementing service. | 24 Service *service; // pointer to implementing service. |
| 25 }; | 25 }; |
| 26 struct CryptohomeClass { GObjectClass parent_class; }; | 26 struct CryptohomeClass { GObjectClass parent_class; }; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 48 GError **error); | 48 GError **error); |
| 49 gboolean cryptohome_get_system_salt(Cryptohome *self, | 49 gboolean cryptohome_get_system_salt(Cryptohome *self, |
| 50 GArray **OUT_salt, | 50 GArray **OUT_salt, |
| 51 GError **error); | 51 GError **error); |
| 52 gboolean cryptohome_is_mounted(Cryptohome *self, | 52 gboolean cryptohome_is_mounted(Cryptohome *self, |
| 53 gboolean *OUT_is_mounted, | 53 gboolean *OUT_is_mounted, |
| 54 GError **error); | 54 GError **error); |
| 55 gboolean cryptohome_mount(Cryptohome *self, | 55 gboolean cryptohome_mount(Cryptohome *self, |
| 56 gchar *userid, | 56 gchar *userid, |
| 57 gchar *key, | 57 gchar *key, |
| 58 gint *OUT_error, |
| 58 gboolean *OUT_done, | 59 gboolean *OUT_done, |
| 59 GError **error); | 60 GError **error); |
| 61 gboolean cryptohome_mount_guest(Cryptohome *self, |
| 62 gint *OUT_error, |
| 63 gboolean *OUT_done, |
| 64 GError **error); |
| 60 gboolean cryptohome_unmount(Cryptohome *self, | 65 gboolean cryptohome_unmount(Cryptohome *self, |
| 61 gboolean *OUT_done, | 66 gboolean *OUT_done, |
| 62 GError **error); | 67 GError **error); |
| 68 |
| 63 } // namespace gobject | 69 } // namespace gobject |
| 64 } // namespace cryptohome | 70 } // namespace cryptohome |
| 65 #endif // CRYPTOHOME_INTERFACE_H_ | 71 #endif // CRYPTOHOME_INTERFACE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2645008:
Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323 (Closed)
Base URL: ssh://git@chromiumos-git/cryptohome.git