Fix upstream: symmetric session encrypt packet only has valid version…

… of 4, not 3
horde · Apr 15, 2015 · cdfd6b6 · cdfd6b6
1 parent 075e1c2
commit cdfd6b6
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
@@ -5,6 +5,8 @@ List of changes from upstream sources:
   Split output armor text every 76 characters (OpenPGP::enarmor()).
   Fix computing signatures for v3 packets (OpenPGP_SignaturePacket#read()).
   Add support for partial packet body lengths (OpenPGP_Packet::parse()).
+  Fix setting version in symmetric-key encrypted session key packet
+  (OpenPGP_SymmetricSessionKeyPacket#__construct()).
 
 - vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php
 

diff --git a/framework/Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp.php b/framework/Pgp/bundle/vendor/singpolyma/openpgp-php/lib/openpgp.php
@@ -1273,7 +1273,7 @@ function header_and_body() {
 class OpenPGP_SymmetricSessionKeyPacket extends OpenPGP_Packet {
   public $version, $symmetric_algorithm, $s2k, $encrypted_data;
 
-  function __construct($s2k=NULL, $encrypted_data='', $symmetric_algorithm=9, $version=3) {
+  function __construct($s2k=NULL, $encrypted_data='', $symmetric_algorithm=9, $version=4) {
     parent::__construct();
     $this->version = $version;
     $this->symmetric_algorithm = $symmetric_algorithm;