complete s/master/primary/

diff --git a/src/password.h b/src/password.h
index 19d05b96a5d8363b2e924e56ff3bd977f3f0c439..68ab75db8afbbf31cb09f92c7803af63b2e7f740 100644 (file)
--- a/src/password.h
+++ b/src/password.h
@@ -23,27 +23,27 @@
 #include <glib.h>
 
 #ifndef PASSWORD_CRYPTO_OLD
-/* Returns a pointer to master passphrase, asking the user
+/* Returns a pointer to primary passphrase, asking the user
  * if necessary. Do not free the return value. */
-const gchar *master_passphrase();
+const gchar *primary_passphrase();
 
-/* Returns TRUE if there is a master passphrase set in preferences. */
-gboolean master_passphrase_is_set();
-/* Returns TRUE if input contains correct master passphrase, as set
+/* Returns TRUE if there is a primary passphrase set in preferences. */
+gboolean primary_passphrase_is_set();
+/* Returns TRUE if input contains correct primary passphrase, as set
  * in preferences. */
-gboolean master_passphrase_is_correct(const gchar *input);
-/* Returns TRUE if master passphrase is entered (unlocked). */
-gboolean master_passphrase_is_entered();
-/* Removes (locks) master passphrase, if it was entered previously
+gboolean primary_passphrase_is_correct(const gchar *input);
+/* Returns TRUE if primary passphrase is entered (unlocked). */
+gboolean primary_passphrase_is_entered();
+/* Removes (locks) primary passphrase, if it was entered previously
  * in current session. */
-void master_passphrase_forget();
+void primary_passphrase_forget();
 
-/* Changes master passphrase. Also triggers reencryption of all stored
- * passwords using the new master passphrase.
- * oldp - old master passphrase; if NULL, it will be retrieved using
- *        master_passphrase()
- * newp - new master passphrase */
-void master_passphrase_change(const gchar *oldp, const gchar *newp);
+/* Changes primary passphrase. Also triggers reencryption of all stored
+ * passwords using the new primary passphrase.
+ * oldp - old primary passphrase; if NULL, it will be retrieved using
+ *        primary_passphrase()
+ * newp - new primary passphrase */
+void primary_passphrase_change(const gchar *oldp, const gchar *newp);
 #endif
 
 /* Wrapper around the old, DES-CBC-broken implementation which

diff --git a/src/password_gtk.h b/src/password_gtk.h
index af0fdcf4f8cfa2f14dcd3e73d0a873d5d5c282a0..bb40ffdb97f15b67ecd7308cbe5823a4f74471ce 100644 (file)
--- a/src/password_gtk.h
+++ b/src/password_gtk.h
@@ -21,7 +21,7 @@
 #define __PASSWORD_GTK_H
 
 #ifndef PASSWORD_CRYPTO_OLD
-void master_passphrase_change_dialog();
+void primary_passphrase_change_dialog();
 #endif
 
 #endif /* __PASSWORD_GTK_H */