diff options
| author | Werner Koch <[email protected]> | 2007-03-08 07:39:57 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-03-08 07:39:57 +0000 |
| commit | c54ef0383c3e8b53a9ab4b7f122a5a9fd1553c4f (patch) | |
| tree | bcea2962c808a90cb615f69fc3da6ca3772da3f2 /g10/keyedit.c | |
| parent | The Cherry XX44 keyboard's PINpad does now work. (diff) | |
| download | gnupg-c54ef0383c3e8b53a9ab4b7f122a5a9fd1553c4f.tar.gz gnupg-c54ef0383c3e8b53a9ab4b7f122a5a9fd1553c4f.zip | |
Fix from 1.4:
* 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.
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 89f26c765..94c34e96e 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1,6 +1,6 @@ /* keyedit.c - keyedit stuff * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - * 2006 Free Software Foundation, Inc. + * 2006, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1554,6 +1554,10 @@ keyedit_menu( const char *username, strlist_t 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 */ |