diff options
| author |   djm <djm@openbsd.org> | 2013-12-29 04:29:25 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-12-29 04:29:25 +0000 |
| commit | 3cc95ad94348ed8bb56db331a122653504fdeed1 (patch) | |
| tree | 8d8ffab2359aa1619fbefd33108ce4cd00439851 | |
| parent | to make sure we don't omit any key types as valid CA keys again, (diff) | |
| download | wireguard-openbsd-3cc95ad94348ed8bb56db331a122653504fdeed1.tar.xz wireguard-openbsd-3cc95ad94348ed8bb56db331a122653504fdeed1.zip | |
allow deletion of ed25519 keys from the agent
| -rw-r--r-- | usr.bin/ssh/authfd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index 7b28f517b12..586d008506b 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/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 @@ -555,9 +555,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); |