security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-29 19:48:43 +01:00
Code Activity

gpg: Exclude expired trusted keys from the key validation process.

Browse Source 
* g10/trustdb.c (copy_key_item): New.
(validate_keys): Use a stripped down UTK list w/o expired keys.
--

This patch makes sure that an expired trusted key is not used for
trust computation.  The test case is to delete a trusted key from the
keyring, import a copy of that key which has already expired, check
that a signed key is not anymore fully trusted and finally import a
prolonged version of the trusted key and check that the signed key is
now again fully trusted.

GnuPG-bug-id: 7200
This commit is contained in:
Werner Koch 2024-09-25 15:15:51 +02:00
parent a0aea09264
commit 19f2f00bfd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
g10/trustdb.c
View File

@ -142,6 +142,24 @@ new_key_item (void)
return k;
}
static struct key_item *
copy_key_item (struct key_item *k0)
{
struct key_item *k;
k = xmalloc_clear (sizeof *k);
k->ownertrust = k0->ownertrust;
k->min_ownertrust = k0->min_ownertrust;
k->trust_depth = k0->trust_depth;
k->trust_value = k0->trust_value;
if (k0->trust_regexp)
k->trust_regexp = xstrdup (k0->trust_regexp);
k->kid[0] = k0->kid[0];
k->kid[1] = k0->kid[1];
return k;
}
static void
release_key_items (struct key_item *k)
{
@ -2178,6 +2196,7 @@ validate_keys (ctrl_t ctrl, int interactive)
{
int rc = 0;
int quit=0;
struct key_item *valid_utk_list = NULL;
struct key_item *klist = NULL;
struct key_item *k;
struct key_array *keys = NULL;
@ -2210,18 +2229,12 @@ validate_keys (ctrl_t ctrl, int interactive)
/* Step 1 */
/* Fixme: Instead of always building a UTK list, we could just build it
* here when needed */
if (!utk_list)
{
if (!opt.quiet)
log_info (_("no ultimately trusted keys found\n"));
goto leave;
}
/* mark all UTKs as used and fully_trusted and set validity to
ultimate */
/* Mark all usable UTKs as used and fully_trusted and set validity
* to ultimate. Create a list of these UTKs for further processing. */
for (k=utk_list; k; k = k->next)
{
KBNODE keyblock;
kbnode_t keyblock;
PKT_public_key *pk;
keyblock = get_pubkeyblock (ctrl, k->kid);
@ -2232,6 +2245,19 @@ validate_keys (ctrl_t ctrl, int interactive)
continue;
}
pk = keyblock->pkt->pkt.public_key;
if (pk->has_expired)
{
log_error (_("Note: ultimately trusted key %s expired\n"),
keystr(k->kid));
continue;
}
{
struct key_item *ki = copy_key_item (k);
ki->next = valid_utk_list;
valid_utk_list = ki;
}
mark_keyblock_seen (used, keyblock);
mark_keyblock_seen (full_trust, keyblock);
for (node=keyblock; node; node = node->next)
@ -2253,7 +2279,13 @@ validate_keys (ctrl_t ctrl, int interactive)
if (opt.trust_model == TM_TOFU)
goto leave;
klist = utk_list;
if (!valid_utk_list)
{
if (!opt.quiet)
log_info (_("no ultimately trusted keys found\n"));
goto leave;
}
klist = valid_utk_list;
if (!opt.quiet)
log_info ("marginals needed: %d completes needed: %d trust model: %s\n",
@ -2326,7 +2358,7 @@ validate_keys (ctrl_t ctrl, int interactive)
valids++;
}
/* Step 4: Find all keys which are signed by a key in kdlist */
/* Step 4: Find all keys which are signed by a key in klist */
keys = validate_key_list (ctrl, kdb, full_trust, klist,
start_time, &next_expire);
if (!keys)
@ -2352,8 +2384,8 @@ validate_keys (ctrl_t ctrl, int interactive)
depth, valids, key_count, ot_unknown, ot_undefined,
ot_never, ot_marginal, ot_full, ot_ultimate );
/* Step 8: Build a new kdlist from all fully valid keys in KEYS */
if (klist != utk_list)
/* Step 8: Build a new klist from all fully valid keys in KEYS */
if (klist != valid_utk_list)
release_key_items (klist);
klist = NULL;
for (kar=keys; kar->keyblock; kar++)
@ -2406,8 +2438,9 @@ validate_keys (ctrl_t ctrl, int interactive)
leave:
keydb_release (kdb);
release_key_array (keys);
if (klist != utk_list)
if (klist != valid_utk_list)
release_key_items (klist);
release_key_items (valid_utk_list);
release_key_hash_table (full_trust);
release_key_hash_table (used);
if (!rc && !quit) /* mark trustDB as checked */