#include "handler.h"
#include "copy.h"
#include "crypt.h"
-#include "pgp.h"
/* print the current time to avoid spoofing of the signature output */
void crypt_current_time (STATE * s, const char *app_name)
state_attach_puts (tmp, s);
}
-#if defined(HAVE_SETRLIMIT)
-
-static void disable_coredumps (void)
-{
- struct rlimit rl = { 0, 0 };
- static short done = 0;
-
- if (!done) {
- setrlimit (RLIMIT_CORE, &rl);
- done = 1;
- }
-}
-
-#endif /* HAVE_SETRLIMIT */
-
int mutt_protect (HEADER * msg, char *keylist)
{
BODY *pbody = NULL, *tmp_pbody = NULL;
BODY *tmp_smime_pbody = NULL;
BODY *tmp_pgp_pbody = NULL;
int flags = msg->security;
- int i;
-
- if ((msg->security & PGPINLINE) == PGPINLINE) {
- /* they really want to send it inline... go for it */
- if (!isendwin ())
- mutt_endwin _("Invoking PGP...");
-
- pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist);
- if (pbody) {
- msg->content = pbody;
- return 0;
- }
-
- /* otherwise inline won't work...ask for revert */
- if ((i = query_quadoption(OPT_PGPMIMEAUTO,
- _("Message can't be sent inline. Revert to using PGP/MIME?")))
- != M_YES) {
- mutt_error _("Mail not sent.");
-
- return -1;
- }
-
- /* go ahead with PGP/MIME */
- }
if (!isendwin ())
mutt_endwin (NULL);
void crypt_extract_keys_from_messages (HEADER * h)
{
int i;
- char tempfname[_POSIX_PATH_MAX], *mbox;
+ char tempfname[_POSIX_PATH_MAX];
address_t *tmp = NULL;
FILE *fpout;
else if (Context->hdrs[Context->v2r[i]]->env->sender)
tmp = mutt_expand_aliases (Context->hdrs[Context->v2r[i]]
->env->sender);
- mbox = tmp ? tmp->mailbox : NULL;
- if (mbox) {
- mutt_endwin (_("Trying to extract S/MIME certificates...\n"));
- crypt_smime_invoke_import (tempfname, mbox);
- tmp = NULL;
- }
+ mutt_endwin (_("Trying to extract S/MIME certificates...\n"));
+ crypt_smime_invoke_import(tempfname);
+ tmp = NULL;
}
rewind (fpout);
tmp = mutt_expand_aliases (h->env->from);
else if (h->env->sender)
tmp = mutt_expand_aliases (h->env->sender);
- mbox = tmp ? tmp->mailbox : NULL;
- if (mbox) { /* else ? */
- mutt_message (_("Trying to extract S/MIME certificates...\n"));
- crypt_smime_invoke_import (tempfname, mbox);
- }
+ mutt_message (_("Trying to extract S/MIME certificates...\n"));
+ crypt_smime_invoke_import(tempfname);
}
}