summaryrefslogtreecommitdiff
path: root/dbus/dbus-sysdeps.c
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2012-04-11 23:05:33 -0400
committerDavid Zeuthen <davidz@redhat.com>2012-04-12 10:53:50 -0400
commit8734e4a16ff220a7af0fd718ba50f92d23c496cf (patch)
treecb19b50f0ea6659d24ca36e86855751d85537afa /dbus/dbus-sysdeps.c
parent3ad045bb8bd3dc3d4544970a4cdb1f2504981cbd (diff)
downloaddbus-8734e4a16ff220a7af0fd718ba50f92d23c496cf.tar.gz
Avoid using monotonic time in the DBUS_COOKIE_SHA1 authentication method
When libdbus-1 moved to using monotonic time support for the DBUS_COOKIE_SHA1 authentication was broken, in particular interoperability with non-libdbus-1 implementations such as GDBus. The problem is that if monotonic clocks are available in the OS, _dbus_get_current_time() will not return the number of seconds since the Epoch so using it for DBUS_COOKIE_SHA1 will violate the D-Bus specification. If both peers are using libdbus-1 it's not a problem since both ends will use the wrong time and thus agree. However, if the other end is another implementation and following the spec it will not work. First, we change _dbus_get_current_time() back so it always returns time since the Epoch and we then rename it _dbus_get_real_time() to make this clear. We then introduce _dbus_get_monotonic_time() and carefully make all current users of _dbus_get_current_time() use it, if applicable. During this audit, one of the callers, _dbus_generate_uuid(), was currently using monotonic time but it was decided to make it use real time instead. Signed-off-by: David Zeuthen <davidz@redhat.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48580
Diffstat (limited to 'dbus/dbus-sysdeps.c')
-rw-r--r--dbus/dbus-sysdeps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 1a93cea7..861bfec9 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -508,7 +508,7 @@ _dbus_generate_pseudorandom_bytes_buffer (char *buffer,
_dbus_verbose ("Falling back to pseudorandom for %d bytes\n",
n_bytes);
- _dbus_get_current_time (NULL, &tv_usec);
+ _dbus_get_real_time (NULL, &tv_usec);
srand (tv_usec);
i = 0;