diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 07eae09f6..3805d35d9 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.296 2018/02/23 04:18:46 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.297 2018/02/23 15:58:38 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 |
@@ -1475,6 +1475,7 @@ show_other_keys(struct hostkeys *hostkeys, struct sshkey *key) | |||
1475 | KEY_DSA, | 1475 | KEY_DSA, |
1476 | KEY_ECDSA, | 1476 | KEY_ECDSA, |
1477 | KEY_ED25519, | 1477 | KEY_ED25519, |
1478 | KEY_XMSS, | ||
1478 | -1 | 1479 | -1 |
1479 | }; | 1480 | }; |
1480 | int i, ret = 0; | 1481 | int i, ret = 0; |
@@ -1592,7 +1593,7 @@ maybe_add_key_to_agent(char *authfile, const struct sshkey *private, | |||
1592 | } | 1593 | } |
1593 | 1594 | ||
1594 | if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0, | 1595 | if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0, |
1595 | (options.add_keys_to_agent == 3))) == 0) | 1596 | (options.add_keys_to_agent == 3), 0)) == 0) |
1596 | debug("identity added to agent: %s", authfile); | 1597 | debug("identity added to agent: %s", authfile); |
1597 | else | 1598 | else |
1598 | debug("could not add identity to agent: %s (%d)", authfile, r); | 1599 | debug("could not add identity to agent: %s (%d)", authfile, r); |