2006-10-21 Havoc Pennington <hp@redhat.com>

[platform/upstream/dbus.git] / dbus / dbus-keyring.h

diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index c60c64e..5df0f79 100644 (file)
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,26 +25,26 @@
 
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-errors.h>
+#include <dbus/dbus-string.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusKeyring DBusKeyring;
 
-
-DBusKeyring* _dbus_keyring_load             (const char       *context,
-                                             DBusResultCode   *result);
-void         _dbus_keyring_ref              (DBusKeyring      *keyring);
-void         _dbus_keyring_unref            (DBusKeyring      *keyring);
-dbus_bool_t  _dbus_keyring_create_challenge (DBusKeyring      *keyring,
-                                             DBusString       *challenge);
-dbus_bool_t  _dbus_keyring_compute_response (DBusKeyring      *keyring,
-                                             const DBusString *challenge,
-                                             DBusString       *response);
-dbus_bool_t  _dbus_keyring_check_response   (DBusKeyring      *keyring,
-                                             const DBusString *challenge,
-                                             const DBusString *response);
-
-
-DBUS_END_DECLS;
+DBusKeyring* _dbus_keyring_new_homedir      (const DBusString  *username,
+                                             const DBusString  *context,
+                                             DBusError         *error);
+DBusKeyring* _dbus_keyring_ref              (DBusKeyring       *keyring);
+void         _dbus_keyring_unref            (DBusKeyring       *keyring);
+dbus_bool_t  _dbus_keyring_validate_context (const DBusString  *context);
+int          _dbus_keyring_get_best_key     (DBusKeyring       *keyring,
+                                             DBusError         *error);
+dbus_bool_t  _dbus_keyring_is_for_user      (DBusKeyring       *keyring,
+                                             const DBusString  *username);
+dbus_bool_t  _dbus_keyring_get_hex_key      (DBusKeyring       *keyring,
+                                             int                key_id,
+                                             DBusString        *hex_key);
+
+DBUS_END_DECLS
 
 #endif /* DBUS_KEYRING_H */