* keylist.c (set_mainkey_capability): Handle 'd' and 'D' used

since gpg 1.3 to denote disabled keys.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 1158538c86be6eef2a5b044d67c5a5fa9a1039e6..040c4588f1715b90f933f8048848df38bb5cc094 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-06  Werner Koch  <wk@gnupg.org>
+
+       * keylist.c (set_mainkey_capability): Handle 'd' and 'D' used
+       since gpg 1.3 to denote disabled keys.
+
 2003-01-06  Marcus Brinkmann  <marcus@g10code.de>
 
        * data-mem.c: Include <string.h>.

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index f38f2919b7ed457a859333408fda565ad11e0f44..9546c7a10899fb464bc6384e115fd22d19b8ebc2 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -43,7 +43,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "0.4.0"
+#define GPGME_VERSION "0.4.1"
 
 
 /* The opaque data types used by GPGME.  */

diff --git a/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c
index 09cb89f09e19e961ed22a92400cc31f6e49448f2..ac6bc4bb1d0354e3e2a576f6952901ec2d55bb19 100644 (file)
--- a/trunk/gpgme/keylist.c
+++ b/trunk/gpgme/keylist.c
@@ -141,6 +141,8 @@ set_mainkey_trust_info (GpgmeKey key, const char *src)
          break;
 
        case 'd':
+          /* Note that gpg 1.3 won't print that anymore but only uses
+             the capabilities field. */
          key->keys.flags.disabled = 1;
          break;
 
@@ -241,6 +243,16 @@ set_mainkey_capability (GpgmeKey key, const char *src)
          key->keys.flags.can_certify = 1;
          break;
 
+        case 'd':
+        case 'D':
+          /* Note, that this flag is also set using the key validity
+             field for backward compatibility with gpg 1.2.  We use d
+             and D, so that a future gpg version will be able to
+             disable certain subkeys. Currently it is expected that
+             gpg sets this for the primary key. */
+                 key->keys.flags.disabled = 1;
+          break;
+
        case 'E':
          key->gloflags.can_encrypt = 1;
          break;