boolify: valid_passphrase()

diff --git a/commands.c b/commands.c
index 492898753fe468db496dc454e76cebadf37c5931..85fa0e3ba284ae49c6f9b132d7a00eae474ae4ca 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -557,7 +557,9 @@ static int pipe_message(struct Mailbox *m, struct EmailList *el, char *cmd,
       mutt_parse_mime_message(m, en->email);
       if ((en->email->security & SEC_ENCRYPT) &&
           !crypt_valid_passphrase(en->email->security))
+      {
         return 1;
+      }
     }
     mutt_endwin();
 

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index a2fe777f6ce47065013b492f2d4abb4b72831562..958df358862e66131401dbc50e68d8899fc5b82f 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -136,12 +136,12 @@ static void disable_coredumps(void)
 /**
  * crypt_valid_passphrase - Check that we have a usable passphrase, ask if not
  * @param flags Flags, see #SecurityFlags
- * @retval  0 Success
- * @retval -1 Failure
+ * @retval true  Success
+ * @retval false Failed
  */
-int crypt_valid_passphrase(SecurityFlags flags)
+bool crypt_valid_passphrase(SecurityFlags flags)
 {
-  int rc = 0;
+  bool rc = false;
 
 #ifndef DEBUG
   disable_coredumps();

diff --git a/ncrypt/crypt_mod.h b/ncrypt/crypt_mod.h
index 147afc15715741a86606c6d11929101b15d42a04..5902dc40814e3a8a042060b732b7224d6005bfcf 100644 (file)
--- a/ncrypt/crypt_mod.h
+++ b/ncrypt/crypt_mod.h
@@ -52,13 +52,13 @@ struct CryptModuleSpecs
   void         (*void_passphrase)(void);
   /**
    * valid_passphrase - Ensure we have a valid passphrase
-   * @retval 1 Success
-   * @retval 0 Failed
+   * @retval true  Success
+   * @retval false Failed
    *
    * If the passphrase is within the expiry time (backend-specific), use it.
    * If not prompt the user again.
    */
-  int          (*valid_passphrase)(void);
+  bool         (*valid_passphrase)(void);
   /**
    * decrypt_mime - Decrypt an encrypted MIME part
    * @param[in]  fp_in  File containing the encrypted part

diff --git a/ncrypt/crypt_mod_pgp_gpgme.c b/ncrypt/crypt_mod_pgp_gpgme.c
index 73151ede229d1c76bb52de7f9e0f68e7aef9a84e..3521d01595497b6d4ab3ba18179261823325e13a 100644 (file)
--- a/ncrypt/crypt_mod_pgp_gpgme.c
+++ b/ncrypt/crypt_mod_pgp_gpgme.c
@@ -46,9 +46,9 @@ static void pgp_gpgme_void_passphrase(void)
  *
  * This is handled by gpg-agent.
  */
-static int pgp_gpgme_valid_passphrase(void)
+static bool pgp_gpgme_valid_passphrase(void)
 {
-  return 1;
+  return true;
 }
 
 // clang-format off

diff --git a/ncrypt/crypt_mod_smime_gpgme.c b/ncrypt/crypt_mod_smime_gpgme.c
index c16cebd1d7dc34b27a6b6dfca95d2332c865b760..afd7b73423d4ec781d99e3c1d75187099682472e 100644 (file)
--- a/ncrypt/crypt_mod_smime_gpgme.c
+++ b/ncrypt/crypt_mod_smime_gpgme.c
@@ -46,9 +46,9 @@ static void smime_gpgme_void_passphrase(void)
  *
  * This is handled by gpg-agent.
  */
-static int smime_gpgme_valid_passphrase(void)
+static bool smime_gpgme_valid_passphrase(void)
 {
-  return 1;
+  return true;
 }
 
 // clang-format off

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index 7f4cac7058f9f7635e45929e56e659d20774de9d..d95deb35842cfce4ac6827f6b2d462c2a0a4f6e7 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -177,12 +177,12 @@ void crypt_pgp_void_passphrase(void)
 /**
  * crypt_pgp_valid_passphrase - Wrapper for CryptModuleSpecs::valid_passphrase()
  */
-int crypt_pgp_valid_passphrase(void)
+bool crypt_pgp_valid_passphrase(void)
 {
   if (CRYPT_MOD_CALL_CHECK(PGP, valid_passphrase))
     return CRYPT_MOD_CALL(PGP, valid_passphrase)();
 
-  return 0;
+  return false;
 }
 
 /**
@@ -358,12 +358,12 @@ void crypt_smime_void_passphrase(void)
 /**
  * crypt_smime_valid_passphrase - Wrapper for CryptModuleSpecs::valid_passphrase()
  */
-int crypt_smime_valid_passphrase(void)
+bool crypt_smime_valid_passphrase(void)
 {
   if (CRYPT_MOD_CALL_CHECK(SMIME, valid_passphrase))
     return CRYPT_MOD_CALL(SMIME, valid_passphrase)();
 
-  return 0;
+  return false;
 }
 
 /**

diff --git a/ncrypt/cryptglue.h b/ncrypt/cryptglue.h
index e169b52a1ef376d34f9a03561ec805c2cb2fa9ff..3a787cb0c499c9d5565533f72489e6af5537527f 100644 (file)
--- a/ncrypt/cryptglue.h
+++ b/ncrypt/cryptglue.h
@@ -35,7 +35,7 @@ void         crypt_pgp_invoke_import(const char *fname);
 void         crypt_pgp_set_sender(const char *sender);
 struct Body *crypt_pgp_sign_message(struct Body *a);
 struct Body *crypt_pgp_traditional_encryptsign(struct Body *a, int flags, char *keylist);
-int          crypt_pgp_valid_passphrase(void);
+bool         crypt_pgp_valid_passphrase(void);
 int          crypt_pgp_verify_one(struct Body *sigbdy, struct State *s, const char *tempf);
 void         crypt_pgp_void_passphrase(void);
 
@@ -44,7 +44,7 @@ char *       crypt_smime_find_keys(struct Address *addrlist, bool oppenc_mode);
 void         crypt_smime_invoke_import(char *infile, char *mailbox);
 void         crypt_smime_set_sender(const char *sender);
 struct Body *crypt_smime_sign_message(struct Body *a);
-int          crypt_smime_valid_passphrase(void);
+bool         crypt_smime_valid_passphrase(void);
 int          crypt_smime_verify_one(struct Body *sigbdy, struct State *s, const char *tempf);
 void         crypt_smime_void_passphrase(void);
 

diff --git a/ncrypt/ncrypt.h b/ncrypt/ncrypt.h
index 85a6dbb92c5b8e022b948d07ffe0cf976587480b..01f40bf41484d018780da7822df44aee42ec3140 100644 (file)
--- a/ncrypt/ncrypt.h
+++ b/ncrypt/ncrypt.h
@@ -186,7 +186,7 @@ void         crypt_forget_passphrase(void);
 int          crypt_get_keys(struct Email *msg, char **keylist, bool oppenc_mode);
 void         crypt_opportunistic_encrypt(struct Email *msg);
 SecurityFlags crypt_query(struct Body *m);
-int          crypt_valid_passphrase(SecurityFlags flags);
+bool         crypt_valid_passphrase(SecurityFlags flags);
 SecurityFlags mutt_is_application_pgp(struct Body *m);
 SecurityFlags mutt_is_application_smime(struct Body *m);
 SecurityFlags mutt_is_malformed_multipart_pgp_encrypted(struct Body *b);

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 9221072889f7bb81041f1e50a7af5e7424e3ee48..59b736d5872aa992e1df078713e2196958fb450e 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -89,20 +89,20 @@ void pgp_class_void_passphrase(void)
 /**
  * pgp_class_valid_passphrase - Implements CryptModuleSpecs::valid_passphrase()
  */
-int pgp_class_valid_passphrase(void)
+bool pgp_class_valid_passphrase(void)
 {
   time_t now = time(NULL);
 
   if (pgp_use_gpg_agent())
   {
     *PgpPass = '\0';
-    return 1; /* handled by gpg-agent */
+    return true; /* handled by gpg-agent */
   }
 
   if (now < PgpExptime)
   {
     /* Use cached copy.  */
-    return 1;
+    return true;
   }
 
   pgp_class_void_passphrase();
@@ -110,12 +110,12 @@ int pgp_class_valid_passphrase(void)
   if (mutt_get_password(_("Enter PGP passphrase:"), PgpPass, sizeof(PgpPass)) == 0)
   {
     PgpExptime = mutt_date_add_timeout(time(NULL), C_PgpTimeout);
-    return 1;
+    return true;
   }
   else
     PgpExptime = 0;
 
-  return 0;
+  return false;
 }
 
 /**

diff --git a/ncrypt/pgp.h b/ncrypt/pgp.h
index ff73498f3c7279f58ef41d371bfb70e7c3945a1f..922527095280689eb42f2ad6fefb0c3c3e54bc97 100644 (file)
--- a/ncrypt/pgp.h
+++ b/ncrypt/pgp.h
@@ -53,7 +53,7 @@ int pgp_class_application_handler(struct Body *m, struct State *s);
 int pgp_class_encrypted_handler(struct Body *a, struct State *s);
 void pgp_class_extract_key_from_attachment(FILE *fp, struct Body *top);
 void pgp_class_void_passphrase(void);
-int pgp_class_valid_passphrase(void);
+bool pgp_class_valid_passphrase(void);
 
 int pgp_class_verify_one(struct Body *sigbdy, struct State *s, const char *tempfile);
 struct Body *pgp_class_traditional_encryptsign(struct Body *a, SecurityFlags flags, char *keylist);

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 555a550367bd458139cfaff0362ec44d8f4d91ea..2fb9b91fd32e59bbf41e3ad46b3cb81e247f593f 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -168,14 +168,14 @@ void smime_class_void_passphrase(void)
 /**
  * smime_class_valid_passphrase - Implements CryptModuleSpecs::valid_passphrase()
  */
-int smime_class_valid_passphrase(void)
+bool smime_class_valid_passphrase(void)
 {
   time_t now = time(NULL);
 
   if (now < SmimeExptime)
   {
     /* Use cached copy.  */
-    return 1;
+    return true;
   }
 
   smime_class_void_passphrase();
@@ -183,12 +183,12 @@ int smime_class_valid_passphrase(void)
   if (mutt_get_password(_("Enter S/MIME passphrase:"), SmimePass, sizeof(SmimePass)) == 0)
   {
     SmimeExptime = mutt_date_add_timeout(time(NULL), C_SmimeTimeout);
-    return 1;
+    return true;
   }
   else
     SmimeExptime = 0;
 
-  return 0;
+  return false;
 }
 
 /*

diff --git a/ncrypt/smime.h b/ncrypt/smime.h
index d03046d70ece4d8d6eefe362fdd15828e71a9ff0..73a205ed3c06deeb50537fabfbd7c15107aa82fd 100644 (file)
--- a/ncrypt/smime.h
+++ b/ncrypt/smime.h
@@ -56,7 +56,7 @@ void         smime_class_getkeys(struct Envelope *env);
 void         smime_class_invoke_import(char *infile, char *mailbox);
 int          smime_class_send_menu(struct Email *msg);
 struct Body *smime_class_sign_message(struct Body *a);
-int          smime_class_valid_passphrase(void);
+bool         smime_class_valid_passphrase(void);
 int          smime_class_verify_one(struct Body *sigbdy, struct State *s, const char *tempfile);
 int          smime_class_verify_sender(struct Email *e);
 void         smime_class_void_passphrase(void);