Upstream fix: s2k salts must be 8 octets, not 10

horde · Apr 15, 2015 · 21b508f · 21b508f
1 parent cdfd6b6
commit 21b508f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/framework/Pgp/bundle/CHANGED b/framework/Pgp/bundle/CHANGED
@@ -17,3 +17,5 @@ List of changes from upstream sources:
 
   Added support for using the openssl extension to parse CAST128 data
   (OpenPGP_Crypt_Symmetric::getCipher()).
+  Fix setting salt size in S2K object when symmetrically encrypting
+  (OpenPGP_Crypt_Symmetric::encrypt()).
diff --git a/framework/Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php b/framework/Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php
@@ -36,7 +36,7 @@ public static function encrypt($passphrases_and_keys, $message, $symmetric_algor
         $esk = pack('n', OpenPGP::bitlength($esk)) . $esk;
         array_unshift($encrypted, new OpenPGP_AsymmetricSessionKeyPacket($pass->algorithm, $pass->fingerprint(), $esk));
       } else if(is_string($pass)) {
-        $s2k = new OpenPGP_S2K(crypt_random_string(10));
+        $s2k = new OpenPGP_S2K(crypt_random_string(8));
         $cipher->setKey($s2k->make_key($pass, $key_bytes));
         $esk = $cipher->encrypt(chr($symmetric_algorithm) . $key);
         array_unshift($encrypted, new OpenPGP_SymmetricSessionKeyPacket($s2k, $esk, $symmetric_algorithm));