Finish master password unload issue. Fix an old bug reintroduced by the magic of copy & paste

3 files changed, 18 insertions, 8 deletions

diff --git a/libsylph/masterpassword.c b/libsylph/masterpassword.c
index bac49c4..3d7af94 100644
--- a/libsylph/masterpassword.c
+++ b/libsylph/masterpassword.c
@@ -50,6 +50,7 @@ void cleanse_buffer(void *buf, size_t len) {
 
 void unload_master_password(void) {
 
+        debug_print("Unloading master password\n");
         if (master_password == NULL) {
                 /* not loaded / already unloaded */
                 return;
@@ -57,6 +58,7 @@ void unload_master_password(void) {
         cleanse_buffer(master_password, strlen(master_password));
         g_free(master_password);
         master_password = NULL;
+        debug_print("Master password unloaded\n");
 
 }
 
@@ -105,7 +107,7 @@ gchar *decrypt_with_master_password(const gchar *str) {
         if (decrypt_data(&new_str,
                                          str + str_prefix,
                                          master_password,
-                                         strlen(str) - str_prefix) != MP_RC_OK) {
+                                         strlen(str) + 1 - str_prefix) != MP_RC_OK) {
                 OPENSSL_cleanse(new_str, strlen(new_str));
                 g_free(new_str);
                 return g_strdup(str);
@@ -136,7 +138,7 @@ gchar *encrypt_with_master_password(const gchar *str) {
                                          &length_encrypted,
                                          str,
                                          master_password,
-                                         strlen(str),
+                                         strlen(str) + 1,
                                          prefs_common.encrypted_password_min_length,
                                          TRUE) != MP_RC_OK) {
                 g_free(new_str);
diff --git a/src/inputdialog.c b/src/inputdialog.c
index 2510bbb..cdfb997 100644
--- a/src/inputdialog.c
+++ b/src/inputdialog.c
@@ -159,9 +159,20 @@ gchar *input_dialog_query_password(const gchar *server, const gchar *user)
 
 gchar *input_dialog_query_master_password(void)
 {
-        return input_dialog_with_invisible(_("Input password"),
-                                                                           _("Master password"),
-                                                                           NULL);
+        gchar *mp_input;
+
+        mp_input = input_dialog_with_invisible(_("Input password"),
+                                                                                   _("Master password"),
+                                                                                   NULL);
+
+        if (prefs_common.use_master_password &&
+                prefs_common.auto_unload_master_password)
+        {
+                g_timeout_add(1000 * 30, unload_master_password, NULL);
+                debug_print("Master password to be unloaded in 30 seconds\n");
+        }
+
+        return mp_input;
 }
 
 gchar *input_dialog_set_new_password(guint max_attempts)
diff --git a/src/main.c b/src/main.c
index 7c37e96..97a4bd0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -426,9 +426,6 @@ int main(int argc, char *argv[])
         if (prefs_common.auto_unload_master_password && master_password_active()) {
                 debug_print("Auto unloading master password\n");
                 unload_master_password();
-                /* call this function every 10th minute in case a reload took place */
-                /* TODO: Perhaps a more elegant solution could be developed */
-                g_timeout_add(1000 * 60 * 10, unload_master_password, NULL);
         }
 #endif