diff options
| author | David Shaw <[email protected]> | 2003-04-09 01:57:46 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-04-09 01:57:46 +0000 |
| commit | 3cf45b304e6df97e360b19408b85cf4d378ca23d (patch) | |
| tree | 3173afb916c178ea2742bee245e9d419a62ec2b0 /g10/import.c | |
| parent | * gpgkeys_hkp.c (dehtmlize, parse_hkp_index): Fix memory corruption bug on (diff) | |
| download | gnupg-3cf45b304e6df97e360b19408b85cf4d378ca23d.tar.gz gnupg-3cf45b304e6df97e360b19408b85cf4d378ca23d.zip | |
* main.h, g10.c (main), import.c (parse_import_options,
fix_pks_corruption): It's really PKS corruption, not HKP corruption.
Keep the old repair-hkp-subkey-bug command as an alias.
* g10.c (main): Rename --no-version to --no-emit-version for consistency.
Keep --no-version as an alias.
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/g10/import.c b/g10/import.c index b49b20217..905e2d859 100644 --- a/g10/import.c +++ b/g10/import.c @@ -95,7 +95,8 @@ parse_import_options(char *str,unsigned int *options) } import_opts[]= { {"allow-local-sigs",IMPORT_ALLOW_LOCAL_SIGS}, - {"repair-hkp-subkey-bug",IMPORT_REPAIR_HKP_SUBKEY_BUG}, + {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG}, + {"repair-pks-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG}, {"fast-import",IMPORT_FAST_IMPORT}, {"convert-sk-to-pk",IMPORT_SK2PK}, {NULL,0} @@ -465,7 +466,7 @@ remove_bad_stuff (KBNODE keyblock) } } -/* Walk through the subkeys on a pk to find if we have the HKP +/* Walk through the subkeys on a pk to find if we have the PKS disease: multiple subkeys with their binding sigs stripped, and the sig for the first subkey placed after the last subkey. That is, instead of "pk uid sig sub1 bind1 sub2 bind2 sub3 bind3" we have @@ -475,7 +476,7 @@ remove_bad_stuff (KBNODE keyblock) sub2 sub3". Returns TRUE if the keyblock was modified. */ static int -fix_hkp_corruption(KBNODE keyblock) +fix_pks_corruption(KBNODE keyblock) { int changed=0,keycount=0; KBNODE node,last=NULL,sknode=NULL; @@ -639,8 +640,8 @@ import_one( const char *fname, KBNODE keyblock, clear_kbnode_flags( keyblock ); - if((options&IMPORT_REPAIR_HKP_SUBKEY_BUG) && fix_hkp_corruption(keyblock)) - log_info(_("key %08lX: HKP subkey corruption repaired\n"), + if((options&IMPORT_REPAIR_PKS_SUBKEY_BUG) && fix_pks_corruption(keyblock)) + log_info(_("key %08lX: PKS subkey corruption repaired\n"), (ulong)keyid[1]); rc = chk_self_sigs( fname, keyblock , pk, keyid, &non_self ); |