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 /test/unbase64.c | |
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 'test/unbase64.c')
-rw-r--r-- | test/unbase64.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/test/unbase64.c b/test/unbase64.c deleted file mode 100644 index 2dc232f3..00000000 --- a/test/unbase64.c +++ /dev/null @@ -1,50 +0,0 @@ -#include <dbus/dbus.h> -#define DBUS_COMPILATION /* cheat and use string etc. */ -#include <dbus/dbus-string.h> -#include <dbus/dbus-sysdeps.h> -#include <dbus/dbus-internals.h> -#undef DBUS_COMPILATION -#include <stdio.h> - -int -main (int argc, - char **argv) -{ - DBusString contents; - DBusString decoded; - DBusString filename; - const char *s; - DBusError error; - - if (argc < 2) - { - fprintf (stderr, "Give the file to decode as an argument\n"); - return 1; - } - - _dbus_string_init_const (&filename, argv[1]); - - if (!_dbus_string_init (&contents)) - return 1; - - if (!_dbus_string_init (&decoded)) - return 1; - - dbus_error_init (&error); - if (!_dbus_file_get_contents (&contents, &filename, &error)) - { - fprintf (stderr, "Failed to load file: %s\n", error.message); - dbus_error_free (&error); - return 1; - } - - if (!_dbus_string_base64_decode (&contents, 0, - &decoded, 0)) - return 1; - - s = _dbus_string_get_const_data (&decoded); - - fputs (s, stdout); - - return 0; -} |