From 6dc7c1eb2a65c6159d9b89bb9267a9b7d8130319 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 1 Apr 2010 12:51:45 -0500
Subject: [PATCH] Abstract extracting a signature packet along with data

---
 lib/openpgp.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/openpgp.php b/lib/openpgp.php
index c83ce8b..2192622 100644
--- a/lib/openpgp.php
+++ b/lib/openpgp.php
@@ -149,11 +149,7 @@ class OpenPGP_Message implements IteratorAggregate, ArrayAccess {
     return $bytes;
   }
 
-  /**
-   * Function to verify signature number $index
-   * $verifiers is an array of callbacks formatted like array('RSA' => array('SHA256' => CALLBACK)) that take two parameters: message and signature
-   */
-  function verify($verifiers, $index=0) {
+  function signature_and_data($index=0) {
     $msg = $this;
     while($msg[0] instanceof OpenPGP_CompressedDataPacket) $msg = $msg[0];
 
@@ -167,6 +163,15 @@ class OpenPGP_Message implements IteratorAggregate, ArrayAccess {
       if($signature_packet && $data_packet) break;
     }
 
+    return array($signature_packet, $data_packet);
+  }
+
+  /**
+   * Function to verify signature number $index
+   * $verifiers is an array of callbacks formatted like array('RSA' => array('SHA256' => CALLBACK)) that take two parameters: message and signature
+   */
+  function verify($verifiers, $index=0) {
+    list($signature_packet, $data_packet) = $this->signature_and_data($index);
     if(!$signature_packet || !$data_packet) return NULL; // No signature or no data
 
     $verifier = $verifiers[$signature_packet->key_algorithm_name()][$signature_packet->hash_algorithm_name()];