diff options
| author | Ingo Klöcker <[email protected]> | 2024-05-15 08:31:46 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2024-05-21 14:38:59 +0000 |
| commit | adadfac997a812699049cd9a5f484cbcabff5bfd (patch) | |
| tree | 41b5c964ed1396b20ede6968379708cc21802faf /src/keylist.c | |
| parent | tests: Fix segv in t-json.c (diff) | |
| download | gpgme-adadfac997a812699049cd9a5f484cbcabff5bfd.tar.gz gpgme-adadfac997a812699049cd9a5f484cbcabff5bfd.zip | |
core: Add information about revocation keys to keys
* src/gpgme.h.in (struct _gpgme_revocation_key,
gpgme_revocation_key_t): New.
(struct _gpgme_key): Add fields 'revkeys', '_last_revkey'.
* src/key.c (_gpgme_key_add_rev_key): New.
(gpgme_key_unref): Free revkeys.
* src/keylist.c (keylist_colon_handler): Parse rvk lines.
* src/ops.h (_gpgme_key_add_rev_key): New.
* tests/run-keylist.c (main): Print revocation key info.
--
GnuPG-bug-id: 7118
Diffstat (limited to 'src/keylist.c')
| -rw-r--r-- | src/keylist.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/src/keylist.c b/src/keylist.c index 1d8c8184..f8dd2962 100644 --- a/src/keylist.c +++ b/src/keylist.c @@ -603,7 +603,7 @@ keylist_colon_handler (void *priv, char *line) enum { RT_NONE, RT_SIG, RT_UID, RT_TFS, RT_SUB, RT_PUB, RT_FPR, RT_FP2, RT_GRP, - RT_SSB, RT_SEC, RT_CRT, RT_CRS, RT_REV, RT_SPK + RT_SSB, RT_SEC, RT_CRT, RT_CRS, RT_REV, RT_SPK, RT_RVK } rectype = RT_NONE; #define NR_FIELDS 20 @@ -669,6 +669,8 @@ keylist_colon_handler (void *priv, char *line) rectype = RT_SSB; else if (!strcmp (field[0], "spk") && key) rectype = RT_SPK; + else if (!strcmp (field[0], "rvk") && key) + rectype = RT_RVK; else rectype = RT_NONE; @@ -1124,6 +1126,39 @@ keylist_colon_handler (void *priv, char *line) keysig->_last_notation = notation; } } + break; + + case RT_RVK: + /* Ignore revocation keys without fingerprint */ + if (fields >= 10 && *field[9]) + { + gpgme_revocation_key_t revkey = NULL; + + err = _gpgme_key_add_rev_key (key, field[9]); + if (err) + return err; + + revkey = key->_last_revkey; + assert (revkey); + + /* Field 4 has the public key algorithm. */ + { + int i = atoi (field[3]); + if (i >= 1 && i < 128) + revkey->pubkey_algo = _gpgme_map_pk_algo (i, ctx->protocol); + } + + /* Field 11 has the class (eg, 0x40 means sensitive). */ + if (fields >= 11 && field[10][0] && field[10][1]) + { + int key_class = _gpgme_hextobyte (field[10]); + if (key_class >= 0) + revkey->key_class = key_class; + if (field[10][2] == 's') + revkey->sensitive = 1; + } + } + break; case RT_NONE: /* Unknown record. */ |