aboutsummaryrefslogtreecommitdiffstats
path: root/g10/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'g10/ChangeLog')
-rw-r--r--g10/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c7fad87c5..c123d8e03 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,12 @@
2005-06-12 David Shaw <[email protected]>
+ * options.h, import.c (parse_import_options,
+ clean_sigs_from_all_uids, import_one): Add import-clean-sigs
+ option to automatically clean a key when importing. Note that
+ when importing a key that is already on the local keyring, the
+ clean applies to the merged key - i.e. existing superceded or
+ invalid signatures are removed.
+
* getkey.c (merge_selfsigs_main, merge_selfsigs_subkey): Make sure
that even after keys may be merged together, we only have one
chosen selfsig.