1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +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:
David Shaw 2007-03-06 06:39:38 +00:00
parent 2a3946e0d1
commit 57591eb76f
3 changed files with 20 additions and 2 deletions

View file

@ -1541,6 +1541,10 @@ keyedit_menu( const char *username, STRLIST locusr,
if( collapse_uids( &keyblock ) )
modified++;
reorder_keyblock(keyblock);
/* We modified the keyblock, so let's make sure the flags are
right. */
if(modified)
merge_keys_and_selfsig( keyblock );
if(seckey_check)
{/* see whether we have a matching secret key */