aboutsummaryrefslogtreecommitdiffstats
path: root/g10/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'g10/ChangeLog')
-rw-r--r--g10/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 03a52b153..af3e65bf7 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-15 Werner Koch <[email protected]>
+
+ * getkey.c (merge_selfsigs): Exit gracefully when a secret key is
+ encountered. May happen if a secret key is in public keyring.
+ Reported by Francesco Potorti.
+
2001-06-12 Werner Koch <[email protected]>
* getkey.c (compare_name): Use ascii_memistr(), ascii_memcasecmp()