Fix to upstream code

horde · Apr 29, 2015 · cd3ba90 · cd3ba90
1 parent f8e5957
commit cd3ba90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/framework/Pgp/bundle/CHANGED b/framework/Pgp/bundle/CHANGED
@@ -9,6 +9,7 @@ List of changes from upstream sources:
   (OpenPGP_SymmetricSessionKeyPacket#__construct()).
   Fix determining message structure when attempting to verify User ID
   signatures (OpenPGP_Message#signatures()).
+  Fix ignoring a 0x30 byte (OpenPGP_Packet#read_byte()).
 
 - 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
@@ -562,7 +562,10 @@ function read_unpacked($count, $format) {
   }
 
   function read_byte() {
-    return ($bytes = $this->read_bytes()) ? $bytes[0] : NULL;
+    /* Begin Horde change */
+    //return ($bytes = $this->read_bytes()) ? $bytes[0] : NULL;
+    return (($bytes = $this->read_bytes()) !== false) ? $bytes[0] : NULL;
+    /* End Horde change */
   }
 
   function read_bytes($count = 1) {