diff options
| author | Werner Koch <[email protected]> | 2020-08-25 08:33:57 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-08-25 08:33:57 +0000 |
| commit | 633c1fea5f0dc4cb270c22ee41c24e1ec0706204 (patch) | |
| tree | d40ad7f6f2c591a7eceb606243f7b5af14733555 /g10/keyedit.c | |
| parent | Add a new dist signing key (diff) | |
| download | gnupg-633c1fea5f0dc4cb270c22ee41c24e1ec0706204.tar.gz gnupg-633c1fea5f0dc4cb270c22ee41c24e1ec0706204.zip | |
gpg: Collapse duplicate subkeys.
* g10/options.h (IMPORT_COLLAPSE_UIDS): New.
(IMPORT_COLLAPSE_SUBKEYS): New.
* g10/gpg.c (main): Make them the default.
* g10/import.c (parse_import_options): New import options
"no-collapse-uids" and "no-collapse_subkeys".
(collapse_subkeys): New.
(import_one_real): Collapse subkeys and allow disabling the collapsing
using the new options.
(read_key_from_file_or_buffer): Always collapse subkeys.
* g10/keyedit.c (fix_keyblock): Call collapse_subkeys.
--
GnuPG-bug-id: 4421
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index ac9f4688c..19fd0a1fc 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1174,6 +1174,8 @@ fix_keyblock (ctrl_t ctrl, kbnode_t *keyblockp) if (collapse_uids (keyblockp)) changed++; + if (collapse_subkeys (keyblockp)) + changed++; if (key_check_all_keysigs (ctrl, 1, *keyblockp, 0, 1)) changed++; reorder_keyblock (*keyblockp); |