# include "config.h"
#endif
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "crypt-mod.h"
mutt_message _("Invoking PGP...");
}
else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) {
- mutt_message _("Invoking SMIME...");
+ mutt_message _("Invoking S/MIME...");
}
}
\f
}
/* 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. */
-void crypt_pgp_invoke_getkeys (ADDRESS * addr)
+void crypt_pgp_invoke_getkeys (address_t * addr)
{
if (CRYPT_MOD_CALL_CHECK (PGP, pgp_invoke_getkeys))
(CRYPT_MOD_CALL (PGP, pgp_invoke_getkeys)) (addr);
/* This routine attempts to find the keyids of the recipients of a
message. It returns NULL if any of the keys can not be found. */
-char *crypt_pgp_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
+char *crypt_pgp_findkeys (address_t * to, address_t * cc, address_t * bcc)
{
if (CRYPT_MOD_CALL_CHECK (PGP, findkeys))
return (CRYPT_MOD_CALL (PGP, findkeys)) (to, cc, bcc);
}
/* 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. */
/* This routine attempts to find the keyids of the recipients of a
message. It returns NULL if any of the keys can not be found. */
-char *crypt_smime_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
+char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc)
{
if (CRYPT_MOD_CALL_CHECK (SMIME, findkeys))
return (CRYPT_MOD_CALL (SMIME, findkeys)) (to, cc, bcc);