diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-08-31 08:11:05 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-08-31 08:11:05 +0000 |
| commit | 27563a5d6b440ec202ce20080ec8064a5c09b755 (patch) | |
| tree | 30400d39fa60c8469c80cca3249d003e0f9e3c96 | |
| parent | 86737c706365f52eb72f75650d1cff5bf5e3e835 (diff) | |
Add a patch to correctly handle attachments in S/MIME encrypted and
signed messages (especially those generated by Outlook).
PR: ports/71181
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=117725
| -rw-r--r-- | mail/mutt-devel/Makefile | 2 | ||||
| -rw-r--r-- | mail/mutt-devel/files/patch-smime-recvattach | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 3c689ca52e7a..1a11b965d782 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -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 diff --git a/mail/mutt-devel/files/patch-smime-recvattach b/mail/mutt-devel/files/patch-smime-recvattach new file mode 100644 index 000000000000..92fa0e2df698 --- /dev/null +++ b/mail/mutt-devel/files/patch-smime-recvattach @@ -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); |