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/main.h | |
| 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/main.h')
| -rw-r--r-- | g10/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/main.h b/g10/main.h index f7f6d0dd1..f13b1b929 100644 --- a/g10/main.h +++ b/g10/main.h @@ -394,7 +394,8 @@ gpg_error_t transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, kbnode_t sec_keyblock, int batch, int force, int only_marked); -int collapse_uids( KBNODE *keyblock ); +int collapse_uids (kbnode_t *keyblock); +int collapse_subkeys (kbnode_t *keyblock); int get_revocation_reason (PKT_signature *sig, char **r_reason, char **r_comment, size_t *r_commentlen); |