diff options
author | markus@openbsd.org <markus@openbsd.org> | 2019-11-12 19:33:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-13 08:54:09 +1100 |
commit | 2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch) | |
tree | 349cdc436823354aca60031358a6030313b6002d /ssh-agent.c | |
parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 07f19c53a..dd9f85ae7 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.239 2019/10/31 21:23:19 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.240 2019/11/12 19:33:08 markus 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 |
@@ -622,7 +622,7 @@ process_add_identity(SocketEntry *e) | |||
622 | } | 622 | } |
623 | } | 623 | } |
624 | if (sk_provider != NULL) { | 624 | if (sk_provider != NULL) { |
625 | if (sshkey_type_plain(k->type) != KEY_ECDSA_SK) { | 625 | if (!sshkey_is_sk(k)) { |
626 | error("Cannot add provider: %s is not a security key", | 626 | error("Cannot add provider: %s is not a security key", |
627 | sshkey_type(k)); | 627 | sshkey_type(k)); |
628 | free(sk_provider); | 628 | free(sk_provider); |