Fix string representation of signed message and literal data

horde · Apr 14, 2015 · e9e627b · e9e627b
1 parent 7691935
commit e9e627b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/framework/Pgp/lib/Horde/Pgp/Element/SignedMessage.php b/framework/Pgp/lib/Horde/Pgp/Element/SignedMessage.php
@@ -47,7 +47,7 @@ public function __construct($data, array $headers = array())
 
             $msg[] = new OpenPGP_LiteralDataPacket(
                 substr($data, 0, $pos),
-                array('format' => 't')
+                array('format' => 'u')
             );
             $msg[] = Horde_Pgp_Element_Signature::create(
                 substr($data, $pos) .  "-----END PGP SIGNATURE-----\n"
@@ -63,10 +63,13 @@ public function __construct($data, array $headers = array())
      */
     public function __toString()
     {
-        $out = parent::__toString();
+        $out = "-----BEGIN PGP SIGNED MESSAGE-----\n";
+        foreach (array_intersect_key($this->headers, array('Hash' => true)) as $key => $val) {
+            $out .= $key . ': ' . $val . "\n";
+        }
 
-        /* Remove trailing END SIGNED MESSAGE armor. */
-        return substr($out, 0, strrpos($out, '-----END'));
+        return $out . "\n" . str_replace("\r\n", "\n", strval($this->text)) .
+            "\n" . strval($this->signature);
     }
 
     /**

diff --git a/framework/Pgp/lib/Horde/Pgp/Element/Text.php b/framework/Pgp/lib/Horde/Pgp/Element/Text.php
@@ -23,4 +23,11 @@
 class Horde_Pgp_Element_Text
 extends Horde_Pgp_Element
 {
+    /**
+     */
+    public function __toString()
+    {
+        return $this->message[0]->data;
+    }
+
 }