diff options
| author | Werner Koch <[email protected]> | 2018-07-09 07:49:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-07-09 08:25:06 +0000 |
| commit | 8055f186a32e628028de897b7ee4705cd8e999b7 (patch) | |
| tree | 6c2047ee628335ba097fc4ec7fdda8c9fc64a5b7 /g10/import.c | |
| parent | gpg: Split key cleaning function for clarity. (diff) | |
| download | gnupg-8055f186a32e628028de897b7ee4705cd8e999b7.tar.gz gnupg-8055f186a32e628028de897b7ee4705cd8e999b7.zip | |
gpg: Let export-clean remove expired subkeys.
* g10/key-clean.h (KEY_CLEAN_NONE, KEY_CLEAN_INVALID)
(KEY_CLEAN_ENCR, KEY_CLEAN_AUTHENCR, KEY_CLEAN_ALL): New.
* g10/key-clean.c (clean_one_subkey): New.
(clean_all_subkeys): Add arg CLEAN_LEVEL.
* g10/import.c (import_one): Call clean_all_subkeys with
KEY_CLEAN_NONE.
* g10/export.c (do_export_stream): Call clean_all_subkeys depedning on
the export clean options.
--
GnuPG-bug-id: 3622
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit c2fd65ec8498a08ee36ca52d99b6b014f6db8d93)
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index 6b6411c24..6dad8ee55 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1746,7 +1746,8 @@ import_one (ctrl_t ctrl, merge_keys_and_selfsig (ctrl, keyblock); clean_all_uids (ctrl, keyblock, opt.verbose, (options&IMPORT_MINIMAL), NULL, NULL); - clean_all_subkeys (ctrl, keyblock, opt.verbose, NULL, NULL); + clean_all_subkeys (ctrl, keyblock, opt.verbose, KEY_CLEAN_NONE, + NULL, NULL); } clear_kbnode_flags( keyblock ); @@ -1892,7 +1893,8 @@ import_one (ctrl_t ctrl, merge_keys_and_selfsig (ctrl, keyblock); clean_all_uids (ctrl, keyblock, opt.verbose, (options&IMPORT_MINIMAL), &n_uids_cleaned,&n_sigs_cleaned); - clean_all_subkeys (ctrl, keyblock, opt.verbose, NULL, NULL); + clean_all_subkeys (ctrl, keyblock, opt.verbose, KEY_CLEAN_NONE, + NULL, NULL); } /* Unless we are in restore mode apply meta data to the @@ -1983,7 +1985,8 @@ import_one (ctrl_t ctrl, clean_all_uids (ctrl, keyblock_orig, opt.verbose, (options&IMPORT_MINIMAL), &n_uids_cleaned,&n_sigs_cleaned); - clean_all_subkeys (ctrl, keyblock_orig, opt.verbose, NULL, NULL); + clean_all_subkeys (ctrl, keyblock_orig, opt.verbose, KEY_CLEAN_NONE, + NULL, NULL); } if (n_uids || n_sigs || n_subk || n_sigs_cleaned || n_uids_cleaned) |