Bug #9493: Do strict e-mail search when retrieving encryption keys

diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php
index a0ef017..c3ba28d 100644 (file)
--- a/imp/lib/Crypt/Pgp.php
+++ b/imp/lib/Crypt/Pgp.php
@@ -214,7 +214,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp
         $params = IMP::getAddressbookSearchParams();
         $result = null;
         try {
-            $result = $GLOBALS['registry']->call('contacts/getField', array($address, self::PUBKEY_FIELD, $params['sources'], false, true));
+            $result = $GLOBALS['registry']->call('contacts/getField', array($address, self::PUBKEY_FIELD, $params['sources'], true, true));
         } catch (Horde_Exception $e) {}
 
         if (is_null($result)) {

diff --git a/imp/lib/Crypt/Smime.php b/imp/lib/Crypt/Smime.php
index 3d46c4d..09718af 100644 (file)
--- a/imp/lib/Crypt/Smime.php
+++ b/imp/lib/Crypt/Smime.php
@@ -193,7 +193,7 @@ class IMP_Crypt_Smime extends Horde_Crypt_Smime
         $params = IMP::getAddressbookSearchParams();
 
         try {
-            $key = $GLOBALS['registry']->call('contacts/getField', array($address, self::PUBKEY_FIELD, $params['sources'], false, true));
+            $key = $GLOBALS['registry']->call('contacts/getField', array($address, self::PUBKEY_FIELD, $params['sources'], true, true));
         } catch (Horde_Exception $e) {
             /* See if the address points to the user's public key. */
             $identity = $GLOBALS['injector']->getInstance('IMP_Identity');