"Master password" is now called "master passphrase".

[claws.git] / src / password.h

diff --git a/src/password.h b/src/password.h
index 8423f4e6da3df9447ee9dbd512c07f32033e56a9..fcaaf4c088ed8f8547706111d357d74aea7ac86c 100644 (file)
--- a/src/password.h
+++ b/src/password.h
@@ -27,23 +27,23 @@
 #include <glib.h>
 
 #ifndef PASSWORD_CRYPTO_OLD
 #include <glib.h>
 
 #ifndef PASSWORD_CRYPTO_OLD

-/* Returns TRUE if there is a master password set in preferences. */
-const gboolean master_password_is_set();
-/* Returns TRUE if input contains correct master password, as set
+/* Returns TRUE if there is a master passphrase set in preferences. */
+const gboolean master_passphrase_is_set();
+/* Returns TRUE if input contains correct master passphrase, as set

  * in preferences. */
  * in preferences. */

-const gboolean master_password_is_correct(const gchar *input);
-/* Returns TRUE if master password is entered (unlocked). */
-gboolean master_password_is_entered();
-/* Removes (locks) master password, if it was entered previously
+const 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

  * in current session. */
  * in current session. */

-void master_password_forget();
+void master_passphrase_forget();

 
 

-/* Changes master password. Also triggers reencryption of all stored
- * password using the new master password.
- * oldp - old master password; if NULL, it will be retrieved using
- *        master_password()
- * newp - new master password */
-void master_password_change(const gchar *oldp, const gchar *newp);
+/* 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);

 #endif
 
 /* Wrapper around the old, DES-CBC-broken implementation which
 #endif
 
 /* Wrapper around the old, DES-CBC-broken implementation which


@@ -56,9 +56,9 @@ gchar *password_decrypt_old(const gchar *password);
 #ifdef PASSWORD_CRYPTO_GNUTLS
 /* GNUTLS implementation */
 gchar *password_encrypt_gnutls(const gchar *password,
 #ifdef PASSWORD_CRYPTO_GNUTLS
 /* GNUTLS implementation */
 gchar *password_encrypt_gnutls(const gchar *password,

-               const gchar *encryption_password);
+               const gchar *encryption_passphrase);

 gchar *password_decrypt_gnutls(const gchar *password,
 gchar *password_decrypt_gnutls(const gchar *password,

-               const gchar *decryption_password);
+               const gchar *decryption_passphrase);

 #define password_encrypt_real(n, m) password_encrypt_gnutls(n, m)
 #define password_decrypt_real(n, m) password_decrypt_gnutls(n, m)
 #endif
 #define password_encrypt_real(n, m) password_encrypt_gnutls(n, m)
 #define password_decrypt_real(n, m) password_decrypt_gnutls(n, m)
 #endif


@@ -66,12 +66,12 @@ gchar *password_decrypt_gnutls(const gchar *password,
 /* Wrapper function that will apply best encryption available,
  * and return a string ready to be saved as-is in preferences. */
 gchar *password_encrypt(const gchar *password,
 /* Wrapper function that will apply best encryption available,
  * and return a string ready to be saved as-is in preferences. */
 gchar *password_encrypt(const gchar *password,

-               const gchar *encryption_password);
+               const gchar *encryption_passphrase);

 
 /* This is a wrapper function that looks at the whole string from
  * prefs (e.g. including the leading '!' for old implementation),
  * and tries to do the smart thing. */
 gchar *password_decrypt(const gchar *password,
 
 /* This is a wrapper function that looks at the whole string from
  * prefs (e.g. including the leading '!' for old implementation),
  * and tries to do the smart thing. */
 gchar *password_decrypt(const gchar *password,

-               const gchar *decryption_password);
+               const gchar *decryption_passphrase);

 
 #endif /* __PASSWORD_H */
 
 #endif /* __PASSWORD_H */