Compress encrypted data, if possible

horde · Apr 15, 2015 · a4dec6b · a4dec6b
1 parent 350c6f8
commit a4dec6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php b/framework/Pgp/lib/Horde/Pgp/Backend/Openpgp.php
@@ -264,12 +264,17 @@ public function encryptSymmetric($text, $passphrase)
      */
     protected function _encrypt($key, $text, $elgamal)
     {
-        $msg = new OpenPGP_Message(array(
-            new OpenPGP_LiteralDataPacket(
-                $text,
-                array('format' => 'u')
-            )
-        ));
+        $data_packet = new OpenPGP_LiteralDataPacket(
+            $text,
+            array('format' => 'u')
+        );
+
+        if (Horde_Util::extensionExists('zlib')) {
+            $data_packet = new OpenPGP_CompressedDataPacket($data_packet);
+            $data_packet->algorithm = 2; // ZLIB
+        }
+
+        $msg = new OpenPGP_Message(array($data_packet));
 
         if ($elgamal) {
             /* Elgamal w/ TripleDES (3DES is a MUST implement, so assume that

diff --git a/framework/Pgp/test/Horde/Pgp/Backend/TestBase.php b/framework/Pgp/test/Horde/Pgp/Backend/TestBase.php
@@ -312,10 +312,11 @@ public function testEncryptSymmetric($data, $pass)
         );
 
         $result2 = $this->_pgp->decryptSymmetric(strval($result), $pass);
+        $result2_sigs = $result2->message->signatures();
 
         $this->assertEquals(
             $data,
-            $result2->message[0]->data
+            $result2_sigs[0][0]->data
         );
     }