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 /sshconnect.c | |
| parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) | |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 177775f6e..7e9369ee3 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sshconnect.c,v 1.321 2019/10/31 21:20:38 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.322 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 |
| @@ -1425,7 +1425,7 @@ maybe_add_key_to_agent(char *authfile, struct sshkey *private, | |||
| 1425 | close(auth_sock); | 1425 | close(auth_sock); |
| 1426 | return; | 1426 | return; |
| 1427 | } | 1427 | } |
| 1428 | if (sshkey_type_plain(private->type) == KEY_ECDSA_SK) | 1428 | if (sshkey_is_sk(private)) |
| 1429 | skprovider = options.sk_provider; | 1429 | skprovider = options.sk_provider; |
| 1430 | if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0, | 1430 | if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0, |
| 1431 | (options.add_keys_to_agent == 3), 0, skprovider)) == 0) | 1431 | (options.add_keys_to_agent == 3), 0, skprovider)) == 0) |