GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug 876

Browse Source
This commit is contained in:
Werner Koch 2008-01-28 18:46:08 +00:00
parent bc617afe5f
commit f9f9a70ec7
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpgme/ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-28 Werner Koch <wk@g10code.com>
* keylist.c (gpgme_get_key): Skip duplicated keys. Fixes bug 876.
2008-01-14 Marcus Brinkmann <marcus@g10code.de> 2008-01-14 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgconf.c (gpgconf_config_load_cb): Fix program_name * engine-gpgconf.c (gpgconf_config_load_cb): Fix program_name

2
gpgme/gpgme.h
View File

@ -72,7 +72,7 @@ extern "C" {
AM_PATH_GPGME macro) check that this header matches the installed AM_PATH_GPGME macro) check that this header matches the installed
library. Warning: Do not edit the next line. configure will do library. Warning: Do not edit the next line. configure will do
that for you! */ that for you! */
#define GPGME_VERSION "1.1.6-svn1282" #define GPGME_VERSION "1.1.7-svn1295"

25
gpgme/keylist.c
View File

@ -1,6 +1,7 @@
/* keylist.c - Listing keys. /* keylist.c - Listing keys.
Copyright (C) 2000 Werner Koch (dd9jn) Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 g10 Code GmbH Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007,
2008 g10 Code GmbH
This file is part of GPGME. This file is part of GPGME.
@ -15,9 +16,8 @@
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this program; if not, write to the Free Software License along with this program; if not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA */
02111-1307, USA. */
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -964,11 +964,26 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
err = gpgme_op_keylist_next (listctx, r_key); err = gpgme_op_keylist_next (listctx, r_key);
if (!err) if (!err)
{ {
try_next_key:
err = gpgme_op_keylist_next (listctx, &key); err = gpgme_op_keylist_next (listctx, &key);
if (gpgme_err_code (err) == GPG_ERR_EOF) if (gpgme_err_code (err) == GPG_ERR_EOF)
err = gpg_error (GPG_ERR_NO_ERROR); err = 0;
else else
{ {
if (!err
&& *r_key && (*r_key)->subkeys && (*r_key)->subkeys->fpr
&& key && key->subkeys && key->subkeys->fpr
&& !strcmp ((*r_key)->subkeys->fpr, key->subkeys->fpr))
{
/* The fingerprint is identical. We assume that this is
the same key and don't mark it as an ambiguous. This
problem may occur with corrupted keyrings and has
been noticed often with gpgsm. In fact gpgsm uses a
similar hack to sort out such duplicates but it can't
do that while listing keys. */
gpgme_key_unref (key);
goto try_next_key;
}
if (!err) if (!err)
{ {
gpgme_key_unref (key); gpgme_key_unref (key);