From 8158680e6e32f02cc592ee4bd5797fec710f91fc Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 5 Jan 2011 11:43:36 -0700 Subject: [PATCH] Bug #9493: Do strict e-mail search when retrieving encryption keys --- imp/lib/Crypt/Pgp.php | 2 +- imp/lib/Crypt/Smime.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php index a0ef0176f..c3ba28dae 100644 --- 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 3d46c4d89..09718affa 100644 --- 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'); -- 2.11.0