diff options
| author | Werner Koch <wk@gnupg.org> | 2018-07-06 11:48:38 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-07-09 08:15:50 +0200 |
| commit | 6c3567196f7e72552f326ce07dccbcce31926e5d (patch) | |
| tree | 1e89d26e8f278c278eefaa379122e8a0b04b7f0e /g10/export.c | |
| parent | gpg: Move key cleaning functions to a separate file. (diff) | |
| download | gnupg2-6c3567196f7e72552f326ce07dccbcce31926e5d.tar.xz gnupg2-6c3567196f7e72552f326ce07dccbcce31926e5d.zip | |
gpg: Split key cleaning function for clarity.
* g10/key-clean.c (clean_key): Rename to clean_all_uids and split
subkey cleaning into ...
(clean_all_subkeys): new. Call that always after the former clean_key
invocations.
--
Note that the clean_all_subkeys function will later be extended.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/export.c')
| -rw-r--r-- | g10/export.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/g10/export.c b/g10/export.c index 44cf075b0..21ff23c8d 100644 --- a/g10/export.c +++ b/g10/export.c @@ -2007,8 +2007,12 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, * UID sigs (0x10, 0x11, 0x12, and 0x13). A designated * revocation is never stripped, even with export-minimal set. */ if ((options & EXPORT_CLEAN)) - clean_key (ctrl, keyblock, opt.verbose, - (options&EXPORT_MINIMAL), NULL, NULL); + { + merge_keys_and_selfsig (ctrl, keyblock); + clean_all_uids (ctrl, keyblock, opt.verbose, + (options&EXPORT_MINIMAL), NULL, NULL); + clean_all_subkeys (ctrl, keyblock, opt.verbose, NULL, NULL); + } if (export_keep_uid) { |