From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 8 Sep 2010 18:29:22 +0000 (-0600)
Subject: All of this data, although in application/* sections, is 7bit
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b669761e3343d8d7e144c8a60a3cfb4015a6bf80;p=horde.git

All of this data, although in application/* sections, is 7bit
---

diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp.php b/framework/Crypt/lib/Horde/Crypt/Pgp.php
index c949fcbbd..a2ae2e85f 100644
--- a/framework/Crypt/lib/Horde/Crypt/Pgp.php
+++ b/framework/Crypt/lib/Horde/Crypt/Pgp.php
@@ -1395,7 +1395,7 @@ class Horde_Crypt_Pgp extends Horde_Crypt
         $pgp_sign->setCharset($this->_params['email_charset']);
         $pgp_sign->setDisposition('inline');
         $pgp_sign->setDescription(Horde_String::convertCharset(_("PGP Digital Signature"), $this->_params['charset'], $this->_params['email_charset']));
-        $pgp_sign->setContents($msg_sign);
+        $pgp_sign->setContents($msg_sign, array('encoding' => '7bit'));
 
         /* Get the algorithim information from the signature. Since we are
          * analyzing a signature packet, we need to use the special keyword
@@ -1444,13 +1444,13 @@ class Horde_Crypt_Pgp extends Horde_Crypt
         $part1 = new Horde_Mime_Part();
         $part1->setType('application/pgp-encrypted');
         $part1->setCharset(null);
-        $part1->setContents("Version: 1\n");
+        $part1->setContents("Version: 1\n", array('encoding' => '7bit'));
         $part->addPart($part1);
 
         $part2 = new Horde_Mime_Part();
         $part2->setType('application/octet-stream');
         $part2->setCharset(null);
-        $part2->setContents($message_encrypt);
+        $part2->setContents($message_encrypt, array('encoding' => '7bit'));
         $part2->setDisposition('inline');
         $part->addPart($part2);
 
@@ -1500,7 +1500,7 @@ class Horde_Crypt_Pgp extends Horde_Crypt
         $part->setType('application/pgp-keys');
         $part->setCharset($this->_params['email_charset']);
         $part->setDescription(Horde_String::convertCharset(_("PGP Public Key"), $this->_params['charset'], $this->_params['charset']));
-        $part->setContents($key);
+        $part->setContents($key, array('encoding' => '7bit'));
 
         return $part;
     }