Master password hash (read and write) implemented

4 files changed, 51 insertions, 6 deletions

diff --git a/libsylph/account.c b/libsylph/account.c
index 95d19fc..05d5871 100644
--- a/libsylph/account.c
+++ b/libsylph/account.c
@@ -37,6 +37,8 @@
 #include "utils.h"
 #include "sylmain.h"
 #include "prefs_common.h"
+#include "ssl.h"
+
 
 PrefsAccount *cur_account;
 
@@ -53,9 +55,49 @@ void account_read_config_all(void)
         gchar buf[PREFSBUFSIZE];
         PrefsAccount *ac_prefs;
 #if USE_SSL
-        gchar *master_password;
+    guint cnt;
+        gchar *master_password, *master_password_confirm;
         if (prefs_common.use_master_password) {
-                master_password = input_query_password("Sylpheed", "Master password");
+                if (prefs_common.master_password_hash != NULL) {
+            for (cnt = 0; cnt < 3; ++cnt) {
+                /* allow 3 attempts to enter the master password */
+                master_password = input_query_password(_("Sylpheed"),
+                                                       _("Master password"));
+                if (check_password(
+                        master_password,
+                        prefs_common.master_password_hash) == RC_OK) {
+                    break;
+                }
+                debug_print(_("Wrong master password entered (%d)\n"), cnt);
+                g_free(master_password);
+                master_password = NULL;
+            }
+            /* TODO: Warning if password is NULL */
+                } else {
+                        /* No master password set (no master_password_hash) */
+            for (cnt = 0; cnt < 3; ++cnt) {
+                master_password = input_query_password(_("Sylpheed"),
+                                                       _("Master password"));
+                master_password_confirm = input_query_password(
+                    _("Sylpheed"),
+                    _("Master password confirmation"));
+                if (strcmp(master_password, master_password_confirm) == 0) {
+                    /* The passwords match */
+                    g_free(master_password_confirm);
+                    if (generate_password_hash(
+                            &prefs_common.master_password_hash,
+                            master_password,
+                            NULL) != RC_OK) {
+                        debug_print(
+                            _("Could not generate master password hash"));
+                        g_free(master_password);
+                        continue;
+                    }
+                    prefs_common_write_config();
+                    break;
+                }
+            }
+                }
         } else {
                 master_password = NULL;
         }
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c
index 1f1d3e2..6c20319 100644
--- a/libsylph/prefs_common.c
+++ b/libsylph/prefs_common.c
@@ -421,6 +421,8 @@ static PrefParam param[] = {
         /* Master password */
         {"use_master_password", "FALSE", &prefs_common.use_master_password,
         P_BOOL},
+        {"master_password_hash", NULL, &prefs_common.master_password_hash,
+         P_STRING},
 
         /* Interface */
         {"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL},
diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h
index ef5bb9b..bc1d2f3 100644
--- a/libsylph/prefs_common.h
+++ b/libsylph/prefs_common.h
@@ -251,6 +251,7 @@ struct _PrefsCommon
 
         /* Master password */
         gboolean use_master_password;
+        gchar *master_password_hash;
 
         /* Interface */
         gboolean sep_folder;
diff --git a/libsylph/ssl.c b/libsylph/ssl.c
index 21686e1..5042f74 100644
--- a/libsylph/ssl.c
+++ b/libsylph/ssl.c
@@ -794,7 +794,7 @@ gint generate_password_hash(gchar **password_hash,
 
     if (salt == NULL) {
         if (RAND_bytes(lsalt, SALT_SIZE) != 1) {
-            g_fprintf(stderr, "Random problems...\n");
+            debug_print("Random problems...\n");
             return RC_ERROR;
         }
     } else {
@@ -850,18 +850,18 @@ gint check_password(const gchar *password, const gchar *password_hash) {
     }
 
     if (token_counter != 4) {
-        g_fprintf(stderr, "Invalid password hash...\n");
+        debug_print("Invalid password hash...\n");
         goto cleanup;
     }
 
     salt = g_base64_decode(*(tokens + 2), &salt_length);
     if (salt_length != SALT_SIZE) {
-        g_fprintf(stderr, "Salt size does not match\n");
+        debug_print("Salt size does not match\n");
         goto cleanup;
     }
 
     if (generate_password_hash(&new_hash, password, salt) != RC_OK) {
-        g_fprintf(stderr, "Password hash generation failed\n");
+        debug_print("Password hash generation failed\n");
         goto cleanup;
     }