X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=cryptglue.c;h=dc82b4aa7b5227cef373913bef8015d88c3dba09;hp=7f055576bdd46b699f51f8c0f73ff58f05e4a811;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/cryptglue.c b/cryptglue.c
index 7f05557..dc82b4a 100644
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -23,9 +23,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 
+
 #include "crypt-mod.h"
 
 /*
@@ -100,7 +103,7 @@ void crypt_invoke_message (int type)
     mutt_message _("Invoking PGP...");
   }
   else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
-    mutt_message _("Invoking SMIME...");
+    mutt_message _("Invoking S/MIME...");
   }
 }
 
@@ -139,17 +142,19 @@ int crypt_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
 }
 
 /* MIME handler for the application/pgp content-type. */
-void crypt_pgp_application_pgp_handler (BODY * m, STATE * s)
+int crypt_pgp_application_pgp_handler (BODY * m, STATE * s)
 {
   if (CRYPT_MOD_CALL_CHECK (PGP, application_handler))
-    (CRYPT_MOD_CALL (PGP, application_handler)) (m, s);
+    return (CRYPT_MOD_CALL (PGP, application_handler)) (m, s);
+  return (-1);
 }
 
 /* MIME handler for an PGP/MIME encrypted message. */
-void crypt_pgp_encrypted_handler (BODY * a, STATE * s)
+int crypt_pgp_encrypted_handler (BODY * a, STATE * s)
 {
   if (CRYPT_MOD_CALL_CHECK (PGP, encrypted_handler))
-    (CRYPT_MOD_CALL (PGP, encrypted_handler)) (a, s);
+    return (CRYPT_MOD_CALL (PGP, encrypted_handler)) (a, s);
+  return (-1);
 }
 
 /* fixme: needs documentation. */
@@ -285,17 +290,19 @@ int crypt_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
 }
 
 /* MIME handler for the application/smime content-type. */
-void crypt_smime_application_smime_handler (BODY * m, STATE * s)
+int crypt_smime_application_smime_handler (BODY * m, STATE * s)
 {
   if (CRYPT_MOD_CALL_CHECK (SMIME, application_handler))
-    (CRYPT_MOD_CALL (SMIME, application_handler)) (m, s);
+    return (CRYPT_MOD_CALL (SMIME, application_handler)) (m, s);
+  return (-1);
 }
 
 /* MIME handler for an PGP/MIME encrypted message. */
-void crypt_smime_encrypted_handler (BODY * a, STATE * s)
+int crypt_smime_encrypted_handler (BODY * a, STATE * s)
 {
   if (CRYPT_MOD_CALL_CHECK (SMIME, encrypted_handler))
-    (CRYPT_MOD_CALL (SMIME, encrypted_handler)) (a, s);
+    return (CRYPT_MOD_CALL (SMIME, encrypted_handler)) (a, s);
+  return (-1);
 }
 
 /* fixme: Needs documentation. */