diff options
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index 62e15eaa2..8e39517ad 100644 --- a/g10/import.c +++ b/g10/import.c @@ -96,7 +96,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}, {NULL,0} }; @@ -452,7 +453,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 @@ -462,7 +463,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; @@ -627,7 +628,9 @@ import_one( const char *fname, KBNODE keyblock, int fast, clear_kbnode_flags( keyblock ); - if((options&IMPORT_REPAIR_HKP_SUBKEY_BUG) && fix_hkp_corruption(keyblock)) + /* It's really PKS corruption, not HKP corruption, but I won't + change the string in stable. */ + if((options&IMPORT_REPAIR_PKS_SUBKEY_BUG) && fix_pks_corruption(keyblock)) log_info(_("key %08lX: HKP subkey corruption repaired\n"), (ulong)keyid[1]); |