summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--authfd.c6
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 @@
57 to make sure we don't omit any key types as valid CA keys again, 57 to make sure we don't omit any key types as valid CA keys again,
58 factor the valid key type check into a key_type_is_valid_ca() 58 factor the valid key type check into a key_type_is_valid_ca()
59 function 59 function
60 - djm@cvs.openbsd.org 2013/12/29 04:29:25
61 [authfd.c]
62 allow deletion of ed25519 keys from the agent
60 63
6120131221 6420131221
62 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. 65 - (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 @@
1/* $OpenBSD: authfd.c,v 1.90 2013/12/06 13:39:49 markus Exp $ */ 1/* $OpenBSD: authfd.c,v 1.91 2013/12/29 04:29:25 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -557,9 +557,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
557 buffer_put_int(&msg, BN_num_bits(key->rsa->n)); 557 buffer_put_int(&msg, BN_num_bits(key->rsa->n));
558 buffer_put_bignum(&msg, key->rsa->e); 558 buffer_put_bignum(&msg, key->rsa->e);
559 buffer_put_bignum(&msg, key->rsa->n); 559 buffer_put_bignum(&msg, key->rsa->n);
560 } else if (key_type_plain(key->type) == KEY_DSA || 560 } else if (key->type != KEY_UNSPEC) {
561 key_type_plain(key->type) == KEY_RSA ||
562 key_type_plain(key->type) == KEY_ECDSA) {
563 key_to_blob(key, &blob, &blen); 561 key_to_blob(key, &blob, &blen);
564 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY); 562 buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
565 buffer_put_string(&msg, blob, blen); 563 buffer_put_string(&msg, blob, blen);