diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:12:31 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:12:31 +0100 |
| commit | fafd784424efc065d8e5f891a09319557c106559 (patch) | |
| tree | 1ff30c1ed7960a4f6fa0259cf65c36e8431b60a0 | |
| parent | 3212c450bbb16199e02c3470fccf593727c567e7 (diff) | |
doc/dbus-specification.xml: Clarify description of DBUS_COOKIE_SHA1 (#10184).
Patch from Kristoffer Lundén.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/dbus-specification.xml | 20 |
2 files changed, 12 insertions, 10 deletions
@@ -1,6 +1,8 @@ 2007-10-09 Simon McVittie <simon.mcvittie@collabora.co.uk> * doc/dbus-specification.xml: Specifically forbid empty structs (#7969) + * doc/dbus-specification.xml: Patch from Kristoffer Lundén to clarify + description of DBUS_COOKIE_SHA1 (#10184) [OK for MIT/X11 licensing] 2007-09-20 Ryan Lortie <desrt@desrt.ca> diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index ac98d1ca..125f892b 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -2084,7 +2084,7 @@ <listitem> <para> The client sends the username it would like to authenticate - as. + as, hex-encoded. </para> </listitem> <listitem> @@ -2092,19 +2092,19 @@ The server sends the name of its "cookie context" (see below); a space character; the integer ID of the secret cookie the client must demonstrate knowledge of; a space character; then a - hex-encoded randomly-generated challenge string. + randomly-generated challenge string, all of this hex-encoded into + one, single string. </para> </listitem> <listitem> <para> - The client locates the cookie, and generates its own hex-encoded - randomly-generated challenge string. The client then - concatenates the server's hex-encoded challenge, a ":" - character, its own hex-encoded challenge, another ":" character, - and the hex-encoded cookie. It computes the SHA-1 hash of this - composite string. It sends back to the server the client's - hex-encoded challenge string, a space character, and the SHA-1 - hash. + The client locates the cookie and generates its own + randomly-generated challenge string. The client then concatenates + the server's decoded challenge, a ":" character, its own challenge, + another ":" character, and the cookie. It computes the SHA-1 hash + of this composite string as a hex digest. It concatenates the + client's challenge string, a space character, and the SHA-1 hex + digest, hex-encodes the result and sends it back to the server. </para> </listitem> <listitem> |