Support full key revocations

horde · Apr 21, 2015 · 0d62799 · 0d62799
1 parent 5e5baa9
commit 0d62799
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/framework/Pgp/lib/Horde/Pgp/Element/Key.php b/framework/Pgp/lib/Horde/Pgp/Element/Key.php
@@ -170,7 +170,7 @@ public function getEncryptPackets()
             return $this->_cache['getEncryptPackets'];
         }
 
-        $fallback = $topkey = null;
+        $fallback = $p = $topkey = null;
         $out = array();
         $sub = false;
 
@@ -231,6 +231,14 @@ public function getEncryptPackets()
                         $sub = true;
                     }
                     break;
+
+                case 0x20:
+                    if ($this->_verifyKeyData($topkey, false, $val)) {
+                        $out = array();
+                        $fallback = null;
+                        break 2;
+                    }
+                    break;
                 }
             }
         }
@@ -262,19 +270,23 @@ abstract public function getPublicKey();
      */
     protected function _verifyKeyData($topkey, $data, $sig)
     {
-        if (!$topkey || !$data) {
+        if (is_null($topkey) || is_null($data)) {
             return false;
         }
 
         $pgp = new Horde_Pgp_Backend_Openpgp();
         $v = $pgp->verify(
             new Horde_Pgp_Element_Message(
-                new OpenPGP_Message(array($topkey, $data, $sig))
+                new OpenPGP_Message(
+                    ($data === false)
+                        ? array($topkey, $sig)
+                        : array($topkey, $data, $sig)
+                )
             ),
             $this
         );
 
-        return isset($v[0][2][0]);
+        return isset($v[0][($data === false) ? 1 : 2][0]);
     }
 
 }
diff --git a/framework/Pgp/test/Horde/Pgp/KeyTest.php b/framework/Pgp/test/Horde/Pgp/KeyTest.php
@@ -348,6 +348,10 @@ public function getEncryptPacketsProvider()
             array(
                 $this->_getKey('pgp_private_rsa.txt', 'private'),
                 1
+            ),
+            array(
+                $this->_getKey('pgp_public_revoked.txt', 'public'),
+                0
             )
         );
     }