From: Michael Stapelberg <michael+sup@stapelberg.de>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] [PATCH] Bugfix: Make sure to use UNIX line-endings for GPG decrypted payloads
Date: Tue, 20 Jul 2010 00:57:18 +0200 [thread overview]
Message-ID: <1279580212-sup-1480@midna.zekjur.net> (raw)
In-Reply-To: <1279568308-sup-1044@midna.zekjur.net>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
Hi,
Excerpts from Michael Stapelberg's message of 2010-07-19 21:39:31 +0200:
> please find attached a patch for the following issue (quuote from the commit
> message):
>
> Bugfix: Make sure to use UNIX line-endings for GPG decrypted payloads
>
> Otherwise, RMail will fail to correctly parse multipart/signed messages
Attached you can find the fixed version of this patch.
Best regards,
Michael
[-- Attachment #2: 0001-Bugfix-Make-sure-to-use-UNIX-line-endings-for-GPG-de.patch --]
[-- Type: application/octet-stream, Size: 957 bytes --]
From 72e5d033926916f619c0c94cafba934c82739581 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 19 Jul 2010 21:37:36 +0200
Subject: [PATCH 1/2] Bugfix: Make sure to use UNIX line-endings for GPG decrypted payloads
Otherwise, RMail will fail to correctly parse multipart/signed messages
---
lib/sup/crypto.rb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
index 289fb0e..ca33052 100644
--- a/lib/sup/crypto.rb
+++ b/lib/sup/crypto.rb
@@ -153,6 +153,8 @@ EOS
output = IO.read output_fn.path
output.force_encoding Encoding::ASCII_8BIT if output.respond_to? :force_encoding
+ ## make sure to use UNIX line-endings (payloads may contain \r\n)
+ output = output.gsub("\r\n", "\n")
## check for a valid signature in an extra run because gpg aborts if the
## signature cannot be verified (but it is still able to decrypt)
--
1.6.5
[-- Attachment #3: Type: text/plain, Size: 143 bytes --]
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
prev parent reply other threads:[~2010-07-19 23:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-19 19:39 Michael Stapelberg
2010-07-19 22:57 ` Michael Stapelberg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1279580212-sup-1480@midna.zekjur.net \
--to=michael+sup@stapelberg.de \
--cc=sup-devel@rubyforge.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox