From 47a7f6e25c986835a3676e7dff4ee493413a47e6 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Sat, 26 Jan 2013 11:10:45 -0500
Subject: [PATCH] Keep trying on failure

---
 lib/openpgp_crypt_aes_tripledes.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/openpgp_crypt_aes_tripledes.php b/lib/openpgp_crypt_aes_tripledes.php
index 8e0d27b..cf1de66 100644
--- a/lib/openpgp_crypt_aes_tripledes.php
+++ b/lib/openpgp_crypt_aes_tripledes.php
@@ -45,7 +45,10 @@ class OpenPGP_Crypt_AES_TripleDES {
              $mkMDC = hash("sha1", $prefix . $data . "\xD3\x14", true);
              if($mkMDC !== $mdc) return false;
 
-             return OpenPGP_Message::parse($data);
+             try {
+               $msg = OpenPGP_Message::parse($data);
+             } catch (Exception $ex) { $msg = NULL; }
+             if($msg) return $msg; /* Otherwise keep trying */
           } else {
             // TODO (resync)
           }
@@ -54,6 +57,8 @@ class OpenPGP_Crypt_AES_TripleDES {
         }
       }
     }
+
+    return NULL; /* If we get here, we failed */
   }
 
   public static function getEncryptedData($m) {