mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Add a patch to correctly handle attachments in S/MIME encrypted and

Browse Source 
signed messages (especially those generated by Outlook).

PR:		ports/71181
Submitted by:	maintainer
This commit is contained in:
Kirill Ponomarev 2004-08-31 08:11:05 +00:00
parent 86737c7063
commit 27563a5d6b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117725
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/mutt-devel/Makefile
View File

@ -81,7 +81,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.5.6
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news

39
mail/mutt-devel/files/patch-smime-recvattach Normal file
View File

@ -0,0 +1,39 @@
diff -u -r3.13 recvattach.c
--- recvattach.c 12 Apr 2004 20:33:33 -0000 3.13
+++ recvattach.c 30 Aug 2004 20:26:30 -0000
@@ -913,18 +913,33 @@
mx_close_message (&msg);
return;
}
- if ((WithCrypto & APPLICATION_SMIME) && hdr->security & APPLICATION_SMIME)
+ if ((WithCrypto & APPLICATION_SMIME) && (hdr->security & APPLICATION_SMIME))
{
if (hdr->env)
crypt_smime_getkeys (hdr->env);
if (mutt_is_application_smime(hdr->content))
+ {
secured = ! crypt_smime_decrypt_mime (msg->fp, &fp,
hdr->content, &cur);
+
+ /* S/MIME nesting */
+ if ((mutt_is_application_smime (cur) & SMIMEOPAQUE))
+ {
+ BODY *_cur = cur;
+ FILE *_fp = fp;
+
+ fp = NULL; cur = NULL;
+ secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur);
+
+ mutt_free_body (&_cur);
+ safe_fclose (&_fp);
+ }
+ }
else
need_secured = 0;
}
- if ((WithCrypto & APPLICATION_PGP) && hdr->security & APPLICATION_PGP)
+ if ((WithCrypto & APPLICATION_PGP) && (hdr->security & APPLICATION_PGP))
{
if (mutt_is_multipart_encrypted(hdr->content))
secured = !crypt_pgp_decrypt_mime (msg->fp, &fp, hdr->content, &cur);