2 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 40befaa78..3e85c79f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,9 @@
      to make sure we don't omit any key types as valid CA keys again,
      factor the valid key type check into a key_type_is_valid_ca()
      function
+   - djm@cvs.openbsd.org 2013/12/29 04:29:25
+     [authfd.c]
+     allow deletion of ed25519 keys from the agent
 
 20131221
  - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
diff --git a/authfd.c b/authfd.c
index 0971cee32..f9636903a 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.90 2013/12/06 13:39:49 markus Exp $ */
+/* $OpenBSD: authfd.c,v 1.91 2013/12/29 04:29:25 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -557,9 +557,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
                 buffer_put_int(&msg, BN_num_bits(key->rsa->n));
                 buffer_put_bignum(&msg, key->rsa->e);
                 buffer_put_bignum(&msg, key->rsa->n);
-        } else if (key_type_plain(key->type) == KEY_DSA ||
-            key_type_plain(key->type) == KEY_RSA ||
-            key_type_plain(key->type) == KEY_ECDSA) {
+        } else if (key->type != KEY_UNSPEC) {
                 key_to_blob(key, &blob, &blen);
                 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
                 buffer_put_string(&msg, blob, blen);