From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.204.134.218 with SMTP id k26cs10488bkt; Fri, 4 Jun 2010 03:00:58 -0700 (PDT) Received: by 10.231.124.14 with SMTP id s14mr604739ibr.167.1275645657820; Fri, 04 Jun 2010 03:00:57 -0700 (PDT) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id c18si1899882ibi.9.2010.06.04.03.00.57; Fri, 04 Jun 2010 03:00:57 -0700 (PDT) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id D96871858373; Fri, 4 Jun 2010 06:00:56 -0400 (EDT) Received: from twice-irc.de (mx2.twice-irc.de [79.140.35.195]) by rubyforge.org (Postfix) with ESMTP id 84754185836D for ; Fri, 4 Jun 2010 05:59:55 -0400 (EDT) Received: from midna.zekjur.net (midna.zekjur.net [IPv6:2001:4d88:1008:4242:21c:c0ff:fe7e:4776]) by twice-irc.de (Postfix) with ESMTPSA id DFC2E1665C5 for ; Fri, 4 Jun 2010 11:59:53 +0200 (CEST) Received: by midna.zekjur.net (Postfix, from userid 101) id 4FEF727EB8; Fri, 4 Jun 2010 11:59:53 +0200 (CEST) From: Michael Stapelberg To: sup-devel Date: Fri, 04 Jun 2010 11:59:53 +0200 Message-Id: <1275645515-sup-4706@midna.zekjur.net> User-Agent: Sup/git Content-Transfer-Encoding: 8bit Content-Type: multipart/mixed; boundary="=-1275645593-279757-13643-1643-1-=" MIME-Version: 1.0 Subject: [sup-devel] [PATCH] Bugfix: Charset conversion needs to take place *after* verifying inline GPG signatures X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --=-1275645593-279757-13643-1643-1-= Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Hi, still fixing some inline GPG problems ;-). This one is a little subtle: If the message arrives in a different encoding than UTF-8 (shame on the sender), the verification will fail because sup modifies the message by converting it to UTF-8. The attached patch fixes this. Best regards, Michael --=-1275645593-279757-13643-1643-1-= Content-Disposition: attachment; filename="0001-Bugfix-Charset-conversion-needs-to-take-place-after-.patch" Content-Type: application/octet-stream; name="0001-Bugfix-Charset-conversion-needs-to-take-place-after-.patch" Content-Transfer-Encoding: base64 RnJvbSBkMDI3ZGEzYTE2ZjQ1MzlmZDNkOWQ2ZDU3NzE5ZWIyODI2MmJhNDc5 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFN0YXBl bGJlcmcgPG1pY2hhZWxAc3RhcGVsYmVyZy5kZT4KRGF0ZTogRnJpLCA0IEp1 biAyMDEwIDExOjUxOjU5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gQnVnZml4 OiBDaGFyc2V0IGNvbnZlcnNpb24gbmVlZHMgdG8gdGFrZSBwbGFjZSAqYWZ0 ZXIqIHZlcmlmeWluZyBpbmxpbmUgR1BHIHNpZ25hdHVyZXMKCk90aGVyd2lz ZSBub24tVVRGLTggbWVzc2FnZXMgKGVzcGVjaWFsbHkgc2VlbiBmcm9tIHBl b3BsZSB1c2luZyB3aW5kb3dzKQphcmUgdmVyaWZpZWQgYXMgaGF2aW5nIGEg YmFkIHNpZ25hdHVyZSBldmVuIHRob3VnaCBpdCBpcyB2YWxpZCAoYmVjYXVz ZQp0aGUgbWVzc2FnZSB3YXMgY29udmVydGVkIGFuZCB0aHVzIHRvdWNoZWQg YmVmb3JlIHZlcmlmeWluZykKLS0tCiBsaWIvc3VwL21lc3NhZ2UucmIgfCAg IDI1ICsrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdl ZCwgMTYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9saWIvc3VwL21lc3NhZ2UucmIgYi9saWIvc3VwL21lc3NhZ2UucmIK aW5kZXggNTIxZjAwZi4uMzk2ZjAxYSAxMDA2NDQKLS0tIGEvbGliL3N1cC9t ZXNzYWdlLnJiCisrKyBiL2xpYi9zdXAvbWVzc2FnZS5yYgpAQCAtNTI1LDE5 ICs1MjUsMjQgQEAgcHJpdmF0ZQogCiAgICAgICAjIyBvdGhlcndpc2UsIGl0 J3MgYm9keSB0ZXh0CiAgICAgICBlbHNlCi0gICAgICAgICMjIGlmIHRoZXJl J3Mgbm8gY2hhcnNldCwgdXNlIHRoZSBjdXJyZW50IGVuY29kaW5nIGFzIHRo ZSBjaGFyc2V0LgotICAgICAgICAjIyB0aGlzIGVuc3VyZXMgdGhhdCB0aGUg Ym9keSBpcyBub3JtYWxpemVkIHRvIGF2b2lkIG5vbi1kaXNwbGF5YWJsZQot ICAgICAgICAjIyBjaGFyYWN0ZXJzCisgICAgICAgICMjIERlY29kZSB0aGUg Ym9keSwgY2hhcnNldCBjb252ZXJzaW9uIHdpbGwgZm9sbG93IGVpdGhlciBp bgorICAgICAgICAjIyBpbmxpbmVfZ3BnX3RvX2NodW5rcyAoZm9yIGlubGlu ZSBHUEcgc2lnbmVkIG1lc3NhZ2VzKSBvcgorICAgICAgICAjIyBhIGZldyBs aW5lcyBiZWxvdyAobWVzc2FnZXMgd2l0aG91dCBpbmxpbmUgR1BHKQorICAg ICAgICBib2R5ID0gbS5ib2R5ID8gbS5kZWNvZGUgOiAiIgorCisgICAgICAg ICMjIENoZWNrIGZvciBpbmxpbmUtUEdQCisgICAgICAgIGNodW5rcyA9IGlu bGluZV9ncGdfdG9fY2h1bmtzIGJvZHksICRlbmNvZGluZywgKG0uY2hhcnNl dCB8fCAkZW5jb2RpbmcpCisgICAgICAgIHJldHVybiBjaHVua3MgaWYgY2h1 bmtzCisKICAgICAgICAgaWYgbS5ib2R5CisgICAgICAgICAgIyMgaWYgdGhl cmUncyBubyBjaGFyc2V0LCB1c2UgdGhlIGN1cnJlbnQgZW5jb2RpbmcgYXMg dGhlIGNoYXJzZXQuCisgICAgICAgICAgIyMgdGhpcyBlbnN1cmVzIHRoYXQg dGhlIGJvZHkgaXMgbm9ybWFsaXplZCB0byBhdm9pZCBub24tZGlzcGxheWFi bGUKKyAgICAgICAgICAjIyBjaGFyYWN0ZXJzCiAgICAgICAgICAgYm9keSA9 IEljb252LmVhc3lfZGVjb2RlKCRlbmNvZGluZywgbS5jaGFyc2V0IHx8ICRl bmNvZGluZywgbS5kZWNvZGUpCiAgICAgICAgIGVsc2UKICAgICAgICAgICBi b2R5ID0gIiIKICAgICAgICAgZW5kCiAKLSAgICAgICAgIyMgQ2hlY2sgZm9y IGlubGluZS1QR1AKLSAgICAgICAgY2h1bmtzID0gaW5saW5lX2dwZ190b19j aHVua3MgYm9keS5zcGxpdCgiXG4iKQotICAgICAgICByZXR1cm4gY2h1bmtz IGlmIGNodW5rcwotCiAgICAgICAgIHRleHRfdG9fY2h1bmtzKGJvZHkubm9y bWFsaXplX3doaXRlc3BhY2Uuc3BsaXQoIlxuIiksIGVuY3J5cHRlZCkKICAg ICAgIGVuZAogICAgIGVuZApAQCAtNTQ2LDEzICs1NTEsMTUgQEAgcHJpdmF0 ZQogICAjIyBsb29rcyBmb3IgZ3BnIHNpZ25lZCAoYnV0IG5vdCBlbmNyeXB0 ZWQpIGlubGluZSAgbWVzc2FnZXMgaW5zaWRlIHRoZQogICAjIyBtZXNzYWdl IGJvZHkgKHRoZXJlIGlzIG5vIGV4dHJhIGhlYWRlciBmb3IgaW5saW5lIEdQ Rykgb3IgZm9yIGVuY3J5cHRlZAogICAjIyAoYW5kIHBvc3NpYmxlIHNpZ25l ZCkgaW5saW5lIEdQRyBtZXNzYWdlcwotICBkZWYgaW5saW5lX2dwZ190b19j aHVua3MgbGluZXMKKyAgZGVmIGlubGluZV9ncGdfdG9fY2h1bmtzIGJvZHks IGVuY29kaW5nX3RvLCBlbmNvZGluZ19mcm9tCisgICAgbGluZXMgPSBib2R5 LnNwbGl0KCJcbiIpCiAgICAgZ3BnID0gbGluZXMuYmV0d2VlbihHUEdfU0lH TkVEX1NUQVJULCBHUEdfU0lHTkVEX0VORCkKICAgICBpZiAhZ3BnLmVtcHR5 PwogICAgICAgbXNnID0gUk1haWw6Ok1lc3NhZ2UubmV3CiAgICAgICBtc2cu Ym9keSA9IGdwZy5qb2luKCJcbiIpCiAKLSAgICAgIHNpZyA9IGxpbmVzLmJl dHdlZW4oR1BHX1NJR05FRF9TVEFSVCwgR1BHX1NJR19FTkQpCisgICAgICBi b2R5ID0gSWNvbnYuZWFzeV9kZWNvZGUoZW5jb2RpbmdfdG8sIGVuY29kaW5n X2Zyb20sIGJvZHkpCisgICAgICBzaWcgPSBib2R5LnNwbGl0KCJcbiIpLmJl dHdlZW4oR1BHX1NJR05FRF9TVEFSVCwgR1BHX1NJR19FTkQpCiAgICAgICBw YXlsb2FkID0gUk1haWw6Ok1lc3NhZ2UubmV3CiAgICAgICBwYXlsb2FkLmJv ZHkgPSBzaWdbMSwgc2lnLnNpemUtMl0uam9pbigiXG4iKQogICAgICAgcmV0 dXJuIFtDcnlwdG9NYW5hZ2VyLnZlcmlmeShuaWwsIG1zZywgZmFsc2UpLCBt ZXNzYWdlX3RvX2NodW5rcyhwYXlsb2FkKV0uZmxhdHRlbi5jb21wYWN0Ci0t IAoxLjcuMQoK --=-1275645593-279757-13643-1643-1-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --=-1275645593-279757-13643-1643-1-=--