Werner Koch
633c1fea5f
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 <wk@gnupg.org>
2020-08-25 10:33:57 +02:00
..
2017-05-11 18:12:37 +02:00
2019-05-14 11:20:07 +09:00
2020-06-09 10:32:47 +09:00
2020-08-19 13:43:16 +02:00
2020-08-19 13:43:16 +02:00
2020-02-20 11:13:32 +01:00
2017-07-24 20:09:52 +02:00
2020-02-20 11:13:32 +01:00
2020-04-03 10:44:32 +02:00
2016-11-02 12:53:58 +01:00
2018-11-08 12:14:23 +09:00
2018-05-29 12:42:52 +02:00
2017-04-11 13:52:19 +09:00
2018-05-02 20:15:10 +02:00
2019-06-23 20:21:02 -04:00
2017-08-01 19:08:16 +02:00
2020-04-16 08:52:29 +02:00
2019-05-17 13:40:24 +02:00
2019-07-18 11:02:34 +09:00
2020-01-17 16:09:01 +09:00
2020-08-24 19:47:26 +02:00
2020-06-23 10:10:29 +09:00
2020-07-07 12:58:29 +02:00
2019-07-25 11:21:58 +09:00
2019-07-25 11:21:58 +09:00
2019-09-30 14:08:13 +02:00
2020-07-16 11:31:13 +02:00
2018-11-08 21:31:12 +02:00
2020-06-09 18:16:44 +02:00
2020-06-08 15:22:58 +02:00
2015-02-04 09:15:34 +01:00
2020-08-25 10:33:57 +02:00
2019-11-28 12:05:32 +01:00
2015-02-04 09:15:34 +01:00
2020-02-10 16:50:47 +01:00
2017-03-07 20:25:54 +09:00
2016-11-05 12:02:19 +01:00
2020-06-08 20:13:25 +02:00
2017-03-07 20:25:54 +09:00
2020-08-25 10:33:57 +02:00
2019-03-15 20:41:38 +01:00
2018-06-07 18:41:17 +02:00
2017-07-27 11:38:57 +02:00
2019-09-05 20:38:23 +02:00
2018-10-25 16:53:05 -04:00
2019-11-28 11:16:13 +01:00
2020-02-18 18:07:46 -05:00
2020-08-07 13:02:47 +09:00
2020-08-25 10:33:57 +02:00
2019-03-15 19:14:34 +01:00
2020-08-19 13:43:16 +02:00
2020-08-07 13:02:47 +09:00
2020-07-03 16:15:29 +02:00
2020-08-07 13:02:40 +09:00
2017-03-31 20:07:20 +02:00
2017-07-13 18:29:01 +02:00
2020-03-13 13:19:31 +01:00
2020-08-25 10:33:57 +02:00
2020-07-03 16:15:29 +02:00
2020-08-20 10:54:17 +02:00
2017-03-07 20:25:54 +09:00
2017-03-07 20:25:54 +09:00
2020-08-19 15:18:42 +09:00
2020-02-18 18:07:46 -05:00
2019-07-11 12:32:44 +09:00
2018-01-28 18:59:18 +01:00
2020-08-25 10:33:57 +02:00
2020-06-08 15:22:58 +02:00
2020-06-09 10:32:47 +09:00
2020-07-08 14:33:25 +02:00
2019-09-27 15:44:23 +02:00
2019-07-23 12:04:21 +09:00
2020-06-09 11:00:16 +02:00
2020-06-24 10:05:03 +09:00
2020-06-09 15:45:51 +09:00
2019-05-17 13:40:24 +02:00
2017-03-07 20:25:54 +09:00
2020-07-14 11:01:45 +02:00
2017-01-23 19:16:55 +01:00
2020-01-17 16:09:01 +09:00
2017-02-21 13:11:46 -05:00
2016-11-05 12:02:19 +01:00
2017-03-07 20:32:09 +09:00
2017-03-07 20:25:54 +09:00
2020-06-09 10:32:47 +09:00
2020-07-03 16:15:29 +02:00
2020-08-13 11:19:22 +02:00
2020-02-12 17:29:51 +01:00
2019-09-09 15:01:47 +02:00
2015-11-17 14:53:03 +01:00
2015-09-02 15:08:57 +02:00
2019-09-09 15:01:47 +02:00
2016-11-05 12:02:19 +01:00
2016-03-08 14:08:49 +01:00
2017-05-10 11:13:03 +09:00
2018-03-27 08:48:00 +02:00
2020-08-07 13:02:47 +09:00
2018-03-26 18:06:43 +02:00
2020-06-08 20:13:25 +02:00
2020-02-10 16:50:47 +01:00
2017-03-07 20:25:54 +09:00
2019-09-09 15:01:47 +02:00
2016-12-06 12:16:56 +01:00
2018-07-06 11:40:16 +02:00
2020-08-07 13:02:47 +09:00
2018-07-06 11:40:16 +02:00
2020-02-10 15:32:55 +01:00
2016-11-05 12:02:19 +01:00