diff options
author | Kristian Høgsberg <krh@redhat.com> | 2004-05-17 22:19:04 +0000 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2004-05-17 22:19:04 +0000 |
commit | d86fc4071ccb8590d922e3456c5c80c0f7bb9d6f (patch) | |
tree | 7ed880494686d9290ad1f9ded6230459e2e7269a /doc | |
parent | 91605d6899e8f21a6adf7f2fc87cfe07d399875f (diff) |
2004-05-17 Kristian Høgsberg <krh@redhat.com>
Remove base64 encoding, replace with hex encoding. Original patch
from trow@ximian.com, added error handling.
* dbus/dbus-string.c (_dbus_string_base64_encode)
(_dbus_string_base64_decode): Remove.
(_dbus_string_hex_decode): Add end_return argument so we can
distinguish between OOM and invalid hex encoding.
(_dbus_string_test): Remove base64 tests and add test case for
invalid hex.
* dbus/dbus-keyring.c, dbus/dbus-auth-script.c, dbus/dbus-auth.c:
Replace base64 with hex.
* test/data/auth/invalid-hex-encoding.auth-script: New test case
for invalid hex encoded data in auth protocol.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/TODO | 4 | ||||
-rw-r--r-- | doc/dbus-specification.xml | 2 | ||||
-rw-r--r-- | doc/dbus-test-plan.xml | 2 |
3 files changed, 2 insertions, 6 deletions
@@ -118,10 +118,6 @@ - recursive dispatch, see dbus_connection_dispatch() - - the auth protocol may as well use hex encoding instead of - base64, then we can dump the base64 implementation and - save some bloat. - - Better error checking for bogus configuration files. Currently if a configuration file tries to include itself the bus crashes on start. We should probably have a check against this. diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index 7a09a5cf..aacb480a 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -911,7 +911,7 @@ <title>DATA Command</title> <para> The DATA command may come from either client or server, and simply - contains a base64-encoded block of data to be interpreted + contains a hex-encoded block of data to be interpreted according to the SASL mechanism in use. </para> <para> diff --git a/doc/dbus-test-plan.xml b/doc/dbus-test-plan.xml index bcb9b3e6..b69f9405 100644 --- a/doc/dbus-test-plan.xml +++ b/doc/dbus-test-plan.xml @@ -135,7 +135,7 @@ ## this tests a successful auth of type EXTERNAL SERVER - SEND 'AUTH EXTERNAL USERNAME_BASE64' + SEND 'AUTH EXTERNAL USERNAME_HEX' EXPECT_COMMAND OK EXPECT_STATE WAITING_FOR_INPUT SEND 'BEGIN' |