From 7e050c88719553d0c74e3dc68caf7bc50ae99590 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 5 Mar 2003 02:01:34 +0000 Subject: 2003-03-04 Havoc Pennington * test/data/auth/*: adapt to changes * dbus/dbus-auth-script.c (_dbus_auth_script_run): add USERID_BASE64 and change USERNAME_BASE64 to put in username not userid * dbus/dbus-keyring.c (_dbus_keyring_validate_context): prevent more stuff from being in a context name, to make the protocol simpler to deal with * dbus/dbus-errors.c (dbus_error_has_name): new function (dbus_error_is_set): new function * dbus/dbus-auth.c: replace DBUS_STUPID_TEST_MECH auth with DBUS_COOKIE_SHA1, implement DBUS_COOKIE_SHA1 * dbus/dbus-connection.c (dbus_connection_flush): also read messages during a flush operation * dbus/Makefile.am: remove dbus-md5 since it isn't currently used. --- dbus/dbus-keyring.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'dbus/dbus-keyring.h') diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h index 28826aed..2a450ec8 100644 --- a/dbus/dbus-keyring.h +++ b/dbus/dbus-keyring.h @@ -39,16 +39,11 @@ 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_create_challenge (DBusString *challenge); -dbus_bool_t _dbus_keyring_compute_response (DBusKeyring *keyring, +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, - const DBusString *challenge, - DBusString *response); -dbus_bool_t _dbus_keyring_check_response (DBusKeyring *keyring, - int key_id, - const DBusString *challenge, - const DBusString *response); - + DBusString *hex_key); DBUS_END_DECLS; -- cgit