2006-12-02 Marcus Brinkmann <marcus@g10code.de>

	* gpgsm/t-keylist.c (main): Skip unknown keys.  Newer versions of
	GPGSM import more keys than older ones.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a25e82b6a6f8c316a251cb0cd44b525e60e16461..3db4b94c2ae5dd4fdf0aa39c50a460b2f0bc14b2 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgsm/t-keylist.c (main): Skip unknown keys.  Newer versions of
+       GPGSM import more keys than older ones.
+
 2005-12-06  Werner Koch  <wk@g10code.com>
 
        * gpg/t-keylist.c (main): Changed for that secondary keys now have

diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 79a61eafebde0f8fd8180e1e162c7243faff5fbb..0f1cf33391fccd4b6be5e61189b43bb38995c6fd 100644 (file)
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -106,6 +106,15 @@ main (int argc, char **argv)
          exit (1);
        }
 
+      if (strcmp (key->subkeys->fpr, keys[i].fpr))
+       {
+         fprintf (stderr, "Warning: Skipping unknown key %s\n",
+                  key->subkeys->fpr);
+         continue;
+       }
+      else
+       printf ("Checking key %s\n", key->subkeys->fpr);
+
       /* Global key flags.  */
       if (key->revoked)
        {