mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keyedit.c (menu_expire): Don't lose key flags when changing the
expiration date of a subkey. This is not the most optimal solution, but it is minimal change on the stable branch. * main.h, keygen.c (do_copy_key_flags): New function to copy key flags, if any, from one sig to another. (do_add_key_expire): New function to add key expiration to a sig. (keygen_copy_flags_add_expire): New version of keygen_add_key_expire that also copies key flags. (keygen_add_key_flags_and_expire): Use do_add_key_expire. * import.c (fix_hkp_corruption): Comment.
This commit is contained in:
parent
98708e1770
commit
db9195c10b
5 changed files with 72 additions and 21 deletions
|
@ -505,6 +505,10 @@ fix_hkp_corruption(KBNODE keyblock)
|
|||
sknode->next=node;
|
||||
last->next=NULL;
|
||||
|
||||
/* Note we aren't checking whether this binding sig is a
|
||||
selfsig. This is not necessary here as the subkey and
|
||||
binding sig will be rejected later if that is the
|
||||
case. */
|
||||
if(check_key_signature(keyblock,node,NULL))
|
||||
{
|
||||
/* Not a match, so undo the changes. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue