* Add a warning in case the length of the string isn't the length of

the decoded base64 content.
* Base64-encoded crypt results of the passwords can contain \0, so
treat them as binary.

diff --git a/src/common/utils.c b/src/common/utils.c
index 9c3d940828d12b473cc6fde8a9703e7b44a27820..f322ac82b3e33ca9c72543dfa49f8323ff3547a6 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -5558,6 +5558,10 @@ guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
 
        g_free(tmp);
 
+       if (strlen(out) != *out_len) {
+               g_warning ("strlen(out) %d != *out_len %d", strlen(out), *out_len);
+       }
+
        return out;
 }
 

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index a4a14e2cb49ba73329a5c711afaee18ca7607c8f..897c9cf1bd99c2b3b2f4ce1ac444893347ed3568 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -222,7 +222,7 @@ static void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                                gchar *tmp;
                                gsize len;
 
-                               tmp = g_base64_decode_zero(&value[1], &len);
+                               tmp = g_base64_decode(&value[1], &len);
                                passcrypt_decrypt(tmp, len);
 
                                *((gchar **)param[i].data) =