#include "sort.h"
#include "copy.h"
#include "pager.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include "mutt_idna.h"
#include <sys/types.h>
#include <sys/stat.h>
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
- fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_error _("Could not create temporary file!");
return 0;
/* see if crytpo is needed for this message. if so, we should exit curses */
if (cur->security) {
if (cur->security & ENCRYPT) {
- if (cur->security & APPLICATION_SMIME)
- crypt_smime_getkeys (cur->env);
- if (!crypt_valid_passphrase (cur->security))
- return 0;
-
cmflags |= M_CM_VERIFY;
}
else if (cur->security & SIGN) {
}
if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
- if (cur->security & APPLICATION_PGP) {
- if (cur->env->from)
- crypt_pgp_invoke_getkeys (cur->env->from);
-
- crypt_invoke_message (APPLICATION_PGP);
- }
-
- if (cur->security & APPLICATION_SMIME)
- crypt_invoke_message (APPLICATION_SMIME);
+ crypt_invoke_message(cur->security);
}
res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
pipe_set_flags (decode, print, &cmflags, &chflags);
if (decode && h->security & ENCRYPT) {
- if (!crypt_valid_passphrase (h->security))
- return;
endwin ();
}
if (decode) {
mutt_parse_mime_message (Context, h);
- if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security))
- return 1;
}
mutt_endwin (NULL);
mutt_message_hook (Context, Context->hdrs[Context->v2r[i]],
M_MESSAGEHOOK);
mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
- if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
- !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
- security))
- return 1;
}
}
buf[0] = 0;
if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
if (!buf[0])
- m_strcpy(buf, sizeof(buf), mlua_reggets(LTK_SHELL));
+ m_strcpy(buf, sizeof(buf), MCore.shell);
if (buf[0]) {
CLEARLINE (LINES - 1);
mutt_endwin (NULL);
if (mutt_save_confirm (buf, &st) != 0)
return -1;
- if (need_passphrase && (decode || decrypt)
- && !crypt_valid_passphrase (app))
- return -1;
-
mutt_message (_("Copying to %s..."), buf);
if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {