mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* packet.h, getkey.c (fixup_uidnode, merge_selfsigs_subkey): Keep track of
which self-sig we actually chose. * keyedit.c (menu_expire, menu_set_primary_uid, menu_set_preferences): Use it here to avoid updating non-used self-sigs and possibly promoting an old self-sig into consideration again.
This commit is contained in:
parent
8e5f3ce846
commit
2980b7129f
4 changed files with 22 additions and 4 deletions
|
@ -1266,6 +1266,7 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated )
|
|||
const byte *p, *sym, *hash, *zip;
|
||||
size_t n, nsym, nhash, nzip;
|
||||
|
||||
sig->flags.chosen_selfsig = 1; /* we chose this one */
|
||||
uid->created = 0; /* not created == invalid */
|
||||
if ( IS_UID_REV ( sig ) ) {
|
||||
uid->is_revoked = 1;
|
||||
|
@ -1887,6 +1888,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
|
|||
|
||||
subpk->is_valid = 1;
|
||||
sig = signode->pkt->pkt.signature;
|
||||
sig->flags.chosen_selfsig=1; /* so we know which selfsig we chose later */
|
||||
|
||||
p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_FLAGS, &n );
|
||||
if ( p && n ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue