From e9d276f08098fbeee311e9a4422f0419faf80abf Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 6 Jan 2003 21:06:23 +0000 Subject: [PATCH] * keylist.c (set_mainkey_capability): Handle 'd' and 'D' used since gpg 1.3 to denote disabled keys. --- trunk/gpgme/ChangeLog | 5 +++++ trunk/gpgme/gpgme.h | 2 +- trunk/gpgme/keylist.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 1158538..040c458 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2003-01-06 Werner Koch + + * keylist.c (set_mainkey_capability): Handle 'd' and 'D' used + since gpg 1.3 to denote disabled keys. + 2003-01-06 Marcus Brinkmann * data-mem.c: Include . diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h index f38f291..9546c7a 100644 --- 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 09cb89f..ac6bc4b 100644 --- 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; -- 2.26.2