diff options
| author | David Shaw <[email protected]> | 2005-06-10 03:00:57 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-06-10 03:00:57 +0000 |
| commit | 045433e35ccfb77c16c2abff889bc338decfdbee (patch) | |
| tree | 0a88c147624a51d21176634d9fac74820e55af2d /g10/export.c | |
| parent | * keydb.h, kbnode.c (undelete_kbnode): New function to undelete a (diff) | |
| download | gnupg-045433e35ccfb77c16c2abff889bc338decfdbee.tar.gz gnupg-045433e35ccfb77c16c2abff889bc338decfdbee.zip | |
* options.h, export.c (do_export_stream), keyedit.c (keyedit_menu,
menu_clean_subkeys_from_key), trustdb.h, trustdb.c
(clean_subkeys_from_key): Remove subkey cleaning function. It is of
very limited usefulness since it cannot be used on any subkey that can
sign, and can only affect multiple selfsigs on encryption-only
subkeys.
Diffstat (limited to 'g10/export.c')
| -rw-r--r-- | g10/export.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/g10/export.c b/g10/export.c index bcb50c9d2..4eba4ee20 100644 --- a/g10/export.c +++ b/g10/export.c @@ -50,14 +50,10 @@ parse_export_options(char *str,unsigned int *options,int noisy) {"export-local-sigs",EXPORT_LOCAL_SIGS,NULL}, {"export-attributes",EXPORT_ATTRIBUTES,NULL}, {"export-sensitive-revkeys",EXPORT_SENSITIVE_REVKEYS,NULL}, - {"export-minimal", - EXPORT_MINIMAL|EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS|EXPORT_CLEAN_SUBKEYS, - NULL}, - {"export-clean", - EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS|EXPORT_CLEAN_SUBKEYS,NULL}, + {"export-minimal",EXPORT_MINIMAL|EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS,NULL}, + {"export-clean",EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS,NULL}, {"export-clean-sigs",EXPORT_CLEAN_SIGS,NULL}, {"export-clean-uids",EXPORT_CLEAN_UIDS,NULL}, - {"export-clean-subkeys",EXPORT_CLEAN_SUBKEYS,NULL}, /* Aliases for backward compatibility */ {"include-local-sigs",EXPORT_LOCAL_SIGS,NULL}, {"include-attributes",EXPORT_ATTRIBUTES,NULL}, @@ -241,9 +237,6 @@ do_export_stream( IOBUF out, STRLIST users, int secret, if(options&EXPORT_CLEAN_UIDS) clean_uids_from_key(keyblock,opt.verbose); - - if(options&EXPORT_CLEAN_SUBKEYS) - clean_subkeys_from_key(keyblock,opt.verbose); } /* and write it */ |