mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keyedit.c (keyedit_menu): If we modify the keyblock (via
fix_keyblock() or collapse_uids()) make sure we reprocess the keyblock so the flags are correct. Noted by Robin H. Johnson. * getkey.c (fixup_uidnode): Properly clear flags that don't apply to us (revoked, expired) so that we can reprocess a uid.
This commit is contained in:
parent
2a3946e0d1
commit
57591eb76f
3 changed files with 20 additions and 2 deletions
|
@ -1485,10 +1485,13 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated )
|
|||
|
||||
sig->flags.chosen_selfsig = 1; /* we chose this one */
|
||||
uid->created = 0; /* not created == invalid */
|
||||
if ( IS_UID_REV ( sig ) ) {
|
||||
if ( IS_UID_REV ( sig ) )
|
||||
{
|
||||
uid->is_revoked = 1;
|
||||
return; /* has been revoked */
|
||||
}
|
||||
}
|
||||
else
|
||||
uid->is_revoked=0;
|
||||
|
||||
uid->expiredate = sig->expiredate;
|
||||
|
||||
|
@ -1497,6 +1500,8 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated )
|
|||
uid->is_expired = 1;
|
||||
return; /* has expired */
|
||||
}
|
||||
else
|
||||
uid->is_expired=0;
|
||||
|
||||
uid->created = sig->timestamp; /* this one is okay */
|
||||
uid->selfsigversion = sig->version;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue