diff options
| author | David Shaw <[email protected]> | 2002-12-01 20:59:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-01 20:59:04 +0000 |
| commit | db9195c10b611e4f79a93ebe7139b4d24c4dd510 (patch) | |
| tree | b6ae0374ee13aaedb22a55b9863ca4108faf424f /g10/import.c | |
| parent | * NEWS: Add notes about notation names and '@', the --trust-model option, (diff) | |
| download | gnupg-db9195c10b611e4f79a93ebe7139b4d24c4dd510.tar.gz gnupg-db9195c10b611e4f79a93ebe7139b4d24c4dd510.zip | |
* 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.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c index d06d957c2..654310267 100644 --- a/g10/import.c +++ b/g10/import.c @@ -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. */ |