state_attach_puts (tmp, s);
}
-
-
-void crypt_forget_passphrase (void)
-{
- crypt_pgp_void_passphrase ();
- crypt_smime_void_passphrase ();
- mutt_message _("Passphrase(s) forgotten.");
-}
-
-
#if defined(HAVE_SETRLIMIT)
static void disable_coredumps (void)
#endif /* HAVE_SETRLIMIT */
-
-int crypt_valid_passphrase (int flags)
-{
- int ret = 0;
-
-# if defined(HAVE_SETRLIMIT)
- disable_coredumps ();
-# endif
-
- if (flags & APPLICATION_PGP)
- ret = crypt_pgp_valid_passphrase ();
-
- if (flags & APPLICATION_SMIME)
- ret = crypt_smime_valid_passphrase ();
-
- return ret;
-}
-
-
-
int mutt_protect (HEADER * msg, char *keylist)
{
BODY *pbody = NULL, *tmp_pbody = NULL;
int flags = msg->security;
int i;
- if ((msg->security & SIGN) && !crypt_valid_passphrase (msg->security))
- return (-1);
-
if ((msg->security & PGPINLINE) == PGPINLINE) {
/* they really want to send it inline... go for it */
if (!isendwin ())
}
/* 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?")))
+ if ((i = query_quadoption(OPT_PGPMIMEAUTO,
+ _("Message can't be sent inline. Revert to using PGP/MIME?")))
!= M_YES) {
mutt_error _("Mail not sent.");
}
-int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
+static void crypt_write_signed(BODY * a, STATE * s, FILE *fp)
{
- FILE *fp;
- int c;
- short hadcr;
- size_t bytes;
-
- if (!(fp = safe_fopen (tempfile, "w"))) {
- mutt_perror (tempfile);
- return -1;
- }
-
- fseeko (s->fpin, a->hdr_offset, 0);
- bytes = a->length + a->offset - a->hdr_offset;
- hadcr = 0;
- while (bytes > 0) {
- if ((c = fgetc (s->fpin)) == EOF)
- break;
-
- bytes--;
-
- if (c == '\r')
- hadcr = 1;
- else {
- if (c == '\n' && !hadcr)
- fputc ('\r', fp);
-
- hadcr = 0;
+ int c;
+ short hadcr;
+ size_t bytes;
+
+ fseeko (s->fpin, a->hdr_offset, 0);
+ bytes = a->length + a->offset - a->hdr_offset;
+ hadcr = 0;
+ while (bytes > 0) {
+ if ((c = fgetc (s->fpin)) == EOF)
+ break;
+
+ bytes--;
+
+ if (c == '\r')
+ hadcr = 1;
+ else {
+ if (c == '\n' && !hadcr)
+ fputc ('\r', fp);
+
+ hadcr = 0;
+ }
+ fputc (c, fp);
}
-
- fputc (c, fp);
-
- }
- fclose (fp);
-
- return 0;
}
if (a->encoding != ENC7BIT) {
a->encoding = ENC7BIT;
convert_to_7bit (a->parts);
- }
- else if (option (OPTPGPSTRICTENC))
+ } else {
convert_to_7bit (a->parts);
+ }
}
else if (a->type == TYPEMESSAGE &&
m_strcasecmp(a->subtype, "delivery-status")) {
else if (a->encoding == ENCBINARY)
a->encoding = ENCBASE64;
else if (a->content && a->encoding != ENCBASE64 &&
- (a->content->from || (a->content->space &&
- option (OPTPGPSTRICTENC))))
+ (a->content->from || a->content->space))
a->encoding = ENCQUOTEDPRINTABLE;
a = a->next;
}
address_t *tmp = NULL;
FILE *fpout;
- fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_error(_("Could not create temporary file"));
return;
for (i = 0; i < Context->vcount; i++) {
if (Context->hdrs[Context->v2r[i]]->tagged) {
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)) {
- fclose (fpout);
- break;
- }
-
if (Context->hdrs[Context->v2r[i]]->security & APPLICATION_PGP) {
mutt_copy_message (fpout, Context, Context->hdrs[Context->v2r[i]],
M_CM_DECODE | M_CM_CHARCONV, 0);
}
else {
mutt_parse_mime_message (Context, h);
- if (!(h->security & ENCRYPT && !crypt_valid_passphrase (h->security))) {
- if (h->security & APPLICATION_PGP) {
- mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
- fflush (fpout);
- mutt_endwin (_("Trying to extract PGP keys...\n"));
- crypt_pgp_invoke_import (tempfname);
- }
+ if (h->security & APPLICATION_PGP) {
+ mutt_copy_message (fpout, Context, h, M_CM_DECODE | M_CM_CHARCONV, 0);
+ fflush (fpout);
+ mutt_endwin (_("Trying to extract PGP keys...\n"));
+ crypt_pgp_invoke_import (tempfname);
+ }
- if (h->security & APPLICATION_SMIME) {
- if (h->security & ENCRYPT)
- mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
- | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
- else
- mutt_copy_message (fpout, Context, h, 0, 0);
-
- fflush (fpout);
- if (h->env->from)
- 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);
- }
+ if (h->security & APPLICATION_SMIME) {
+ if (h->security & ENCRYPT)
+ mutt_copy_message (fpout, Context, h, M_CM_NOHEADER
+ | M_CM_DECODE_CRYPT | M_CM_DECODE_SMIME, 0);
+ else
+ mutt_copy_message (fpout, Context, h, 0, 0);
+
+ fflush (fpout);
+ if (h->env->from)
+ 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);
}
}
}
- fclose (fpout);
+ m_fclose(&fpout);
if (isendwin ())
mutt_any_key_to_continue (NULL);
int mutt_signed_handler (BODY * a, STATE * s)
{
char tempfile[_POSIX_PATH_MAX];
+ FILE * tempfp;
char *protocol;
int protocol_major = TYPEOTHER;
char *protocol_minor = NULL;
crypt_fetch_signatures (&signatures, a->next, &sigcnt);
if (sigcnt) {
- mutt_mktemp (tempfile);
- if (crypt_write_signed (a, s, tempfile) == 0) {
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ if (!tempfp) {
+ mutt_error(_("Could not create temporary file"));
+ } else {
+ crypt_write_signed(a, s, tempfp);
+ m_fclose(&tempfp);
for (i = 0; i < sigcnt; i++) {
if (signatures[i]->type == TYPEAPPLICATION
&& !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
projects / apps / madmutt.git / blobdiff