projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove old pile of crap and cruft
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
8b5444b
..
cf56023
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-28,7
+28,7
@@
#include "sort.h"
#include "copy.h"
#include "pager.h"
#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>
#include "mutt_idna.h"
#include <sys/types.h>
#include <sys/stat.h>
@@
-56,7
+56,7
@@
int mutt_display_message (HEADER * cur)
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
- fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
Te
mpdir), NULL);
+ fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(
MCore.t
mpdir), NULL);
if (!fpout) {
mutt_error _("Could not create temporary file!");
return 0;
if (!fpout) {
mutt_error _("Could not create temporary file!");
return 0;
@@
-91,11
+91,6
@@
int mutt_display_message (HEADER * cur)
/* see if crytpo is needed for this message. if so, we should exit curses */
if (cur->security) {
if (cur->security & ENCRYPT) {
/* 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) {
cmflags |= M_CM_VERIFY;
}
else if (cur->security & SIGN) {
@@
-108,15
+103,7
@@
int mutt_display_message (HEADER * cur)
}
if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
}
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,
}
res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,
@@
-301,8
+288,6
@@
static void pipe_msg (HEADER * h, FILE * fp, int decode, int print)
pipe_set_flags (decode, print, &cmflags, &chflags);
if (decode && h->security & ENCRYPT) {
pipe_set_flags (decode, print, &cmflags, &chflags);
if (decode && h->security & ENCRYPT) {
- if (!crypt_valid_passphrase (h->security))
- return;
endwin ();
}
endwin ();
}
@@
-335,8
+320,6
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
if (decode) {
mutt_parse_mime_message (Context, h);
if (decode) {
mutt_parse_mime_message (Context, h);
- if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security))
- return 1;
}
mutt_endwin (NULL);
}
mutt_endwin (NULL);
@@
-358,10
+341,6
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
mutt_message_hook (Context, Context->hdrs[Context->v2r[i]],
M_MESSAGEHOOK);
mutt_parse_mime_message (Context, Context->hdrs[Context->v2r[i]]);
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;
}
}
}
}
@@
-713,10
+692,6
@@
int mutt_save_message (HEADER * h, int delete,
if (mutt_save_confirm (buf, &st) != 0)
return -1;
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) {
mutt_message (_("Copying to %s..."), buf);
if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {