#include "handler.h"
#include "sort.h"
#include "thread.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include <imap/imap.h>
static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
{
- CONTEXT *ctx = (CONTEXT *) menu->data;
-
- _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
- M_FORMAT_ARROWCURSOR);
+ CONTEXT *ctx = (CONTEXT *)menu->data;
+ _mutt_make_string(s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry], 0);
}
static HEADER *select_msg (void)
string_list_wipe(&tmp);
tmp = next;
}
- else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
- * by old mutt versions
- */
- || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ else if (m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
{
int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
newhdr->security |= ENCRYPT | ccap;
- if (!crypt_valid_passphrase (ccap))
- goto err;
-
mutt_message _("Decrypting message...");
if (((ccap & APPLICATION_PGP)
&& crypt_pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
|| ((ccap & APPLICATION_SMIME)
&& crypt_smime_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
- || b == NULL) {
- err:
+ || b == NULL)
+ {
mx_close_message (&msg);
envelope_delete(&newhdr->env);
body_list_wipe(&newhdr->content);
parameter_delval(&b->parameter, "x-mutt-noconv");
}
- s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file);
+ s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
if (!s.fpout)
goto bail;
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
- if (option (OPTSMIMEISDEFAULT))
+ if (mod_crypt.smime_is_default)
newhdr->security &= ~APPLICATION_PGP;
else
newhdr->security &= ~APPLICATION_SMIME;