From 633c1fea5f0dc4cb270c22ee41c24e1ec0706204 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 25 Aug 2020 10:33:57 +0200 Subject: 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 --- g10/keyedit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'g10/keyedit.c') 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); -- cgit v1.2.3