projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
cryptglue.c
diff --git
a/cryptglue.c
b/cryptglue.c
index
ee9f61b
..
d73ddcd
100644
(file)
--- a/
cryptglue.c
+++ b/
cryptglue.c
@@
-102,7
+102,7
@@
void crypt_invoke_message (int type)
mutt_message _("Invoking PGP...");
}
else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
mutt_message _("Invoking PGP...");
}
else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
- mutt_message _("Invoking SMIME...");
+ mutt_message _("Invoking S
/
MIME...");
}
}
\f
}
}
\f
@@
-141,17
+141,19
@@
int crypt_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
}
/* MIME handler for the application/pgp content-type. */
}
/* 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))
{
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. */
}
/* 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))
{
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. */
}
/* fixme: needs documentation. */
@@
-287,17
+289,19
@@
int crypt_smime_decrypt_mime (FILE * a, FILE ** b, BODY * c, BODY ** d)
}
/* MIME handler for the application/smime content-type. */
}
/* 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))
{
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. */
}
/* 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))
{
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. */
}
/* fixme: Needs documentation. */