diff options
| author | Werner Koch <wk@gnupg.org> | 2021-02-02 12:57:00 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-02-02 12:57:00 +0100 |
| commit | 3491faa3bb62c1c96c6dd5947516128b2a966535 (patch) | |
| tree | d06e2fb008451789512a94cdf81d9b3a2496a04b /g10/export.c | |
| parent | card: List keys of pkcs#15 cards. (diff) | |
| download | gnupg2-3491faa3bb62c1c96c6dd5947516128b2a966535.tar.xz gnupg2-3491faa3bb62c1c96c6dd5947516128b2a966535.zip | |
gpg: Remove experimental feature to export w/o user-ids.
* g10/options.h (IMPORT_DROP_UIDS, EXPORT_DROP_UIDS): Remove.
* g10/import.c (parse_import_options): Remove option import-drop-uids.
(import_one_real): Remove drop uids code.
(remove_all_uids): Remove function.
* g10/export.c (parse_export_options): Remove option export-drop-uids.
(do_export_one_keyblock): Remove drop uids code.
Diffstat (limited to 'g10/export.c')
| -rw-r--r-- | g10/export.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/g10/export.c b/g10/export.c index 5cbe58180..396bc2780 100644 --- a/g10/export.c +++ b/g10/export.c @@ -126,8 +126,6 @@ parse_export_options(char *str,unsigned int *options,int noisy) N_("remove unusable parts from key during export")}, {"export-minimal",EXPORT_MINIMAL|EXPORT_CLEAN,NULL, N_("remove as much as possible from key during export")}, - {"export-drop-uids", EXPORT_DROP_UIDS, NULL, - N_("Do not export user id or attribute packets")}, {"export-pka", EXPORT_PKA_FORMAT, NULL, NULL }, {"export-dane", EXPORT_DANE_FORMAT, NULL, NULL }, @@ -161,9 +159,7 @@ parse_export_options(char *str,unsigned int *options,int noisy) *options &= ~(EXPORT_CLEAN | EXPORT_MINIMAL | EXPORT_PKA_FORMAT | EXPORT_DANE_FORMAT); } - /* Dropping uids also means to drop attributes. */ - if ((*options & EXPORT_DROP_UIDS)) - *options &= ~(EXPORT_ATTRIBUTES); + return rc; } @@ -1718,19 +1714,6 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, } } - /* Don't export user ids (and attributes)? This is not RFC-4880 - * compliant but we allow it anyway. */ - if ((options & EXPORT_DROP_UIDS) - && node->pkt->pkttype == PKT_USER_ID) - { - /* Skip until we get to something that is not a user id (or - * attrib) or a signature on it. */ - while (kbctx->next && kbctx->next->pkt->pkttype == PKT_SIGNATURE) - kbctx = kbctx->next; - - continue; - } - /* Don't export attribs? */ if (!(options & EXPORT_ATTRIBUTES) && node->pkt->pkttype == PKT_USER_ID |