summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2019-11-12 19:33:08 +0000
committerDamien Miller <djm@mindrot.org>2019-11-13 08:54:09 +1100
commit2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch)
tree349cdc436823354aca60031358a6030313b6002d /sshconnect.c
parentfd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff)
downloadopenssh-git-2c55744a56de0ffc81fe445a1e7fc5cd308712b3.tar.gz
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 177775f6..7e9369ee 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.321 2019/10/31 21:20:38 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.322 2019/11/12 19:33:08 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1425,7 +1425,7 @@ maybe_add_key_to_agent(char *authfile, struct sshkey *private,
close(auth_sock);
return;
}
- if (sshkey_type_plain(private->type) == KEY_ECDSA_SK)
+ if (sshkey_is_sk(private))
skprovider = options.sk_provider;
if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0,
(options.add_keys_to_agent == 3), 0, skprovider)) == 0)