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 cf00a1e6b..ba1a49479 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-21 David Shaw <[email protected]>
+
+ * getkey.c (merge_selfsigs): If a subkey is already revoked by the
+ owner, don't allow a designated revokation of the whole key to
+ override this. We're still revoked either way, of course.
+
2004-01-20 David Shaw <[email protected]>
* g10.c (list_config): Add "version" tag for --list-config.