security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-25 15:27:03 +01:00
Code Activity

gpg: Also delete key-binding signature when deleting a subkey.

Browse Source 
* g10/delkey.c (do_delete_key): Simplify and correct subkey deletion.
--

GnuPG-bug-id: 4665, 4457
Fixes-commit: d9b31d3a20b89a5ad7e9a2158b6da63a9a37fa8a
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-10-15 14:30:57 +02:00
parent 2906636b92
commit d8052db74a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
g10/delkey.c
View File

@ -281,25 +281,16 @@ do_delete_key (ctrl_t ctrl, const char *username, int secret, int force,
} }
else if (thiskeyonly == 2) else if (thiskeyonly == 2)
{ {
int selected = 0;
/* Delete the specified public subkey. */ /* Delete the specified public subkey. */
for (kbctx=NULL; (node = walk_kbnode (keyblock, &kbctx, 0)); ) for (kbctx=NULL; (node = walk_kbnode (keyblock, &kbctx, 0)); )
{ if (targetnode == node)
if (thiskeyonly && targetnode != node) break;
continue; log_assert (node);
delete_kbnode (node);
while ((node = walk_kbnode (keyblock, &kbctx, 0))
&& node->pkt->pkttype == PKT_SIGNATURE)
delete_kbnode (node);
if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
{
selected = targetnode == node;
if (selected)
delete_kbnode (node);
}
else if (selected && node->pkt->pkttype == PKT_SIGNATURE)
delete_kbnode (node);
else
selected = 0;
}
commit_kbnode (&keyblock); commit_kbnode (&keyblock);
err = keydb_update_keyblock (ctrl, hd, keyblock); err = keydb_update_keyblock (ctrl, hd, keyblock);
if (err) if (err)