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-add.c | |
parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.143 2019/10/31 21:19:56 djm Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.144 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 |
@@ -81,6 +81,7 @@ static char *default_files[] = { | |||
81 | #endif | 81 | #endif |
82 | #endif /* WITH_OPENSSL */ | 82 | #endif /* WITH_OPENSSL */ |
83 | _PATH_SSH_CLIENT_ID_ED25519, | 83 | _PATH_SSH_CLIENT_ID_ED25519, |
84 | _PATH_SSH_CLIENT_ID_ED25519_SK, | ||
84 | _PATH_SSH_CLIENT_ID_XMSS, | 85 | _PATH_SSH_CLIENT_ID_XMSS, |
85 | NULL | 86 | NULL |
86 | }; | 87 | }; |
@@ -312,7 +313,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag, | |||
312 | ssh_free_identitylist(idlist); | 313 | ssh_free_identitylist(idlist); |
313 | } | 314 | } |
314 | 315 | ||
315 | if (sshkey_type_plain(private->type) != KEY_ECDSA_SK) | 316 | if (!sshkey_is_sk(private)) |
316 | skprovider = NULL; /* Don't send constraint for other keys */ | 317 | skprovider = NULL; /* Don't send constraint for other keys */ |
317 | else if (skprovider == NULL) { | 318 | else if (skprovider == NULL) { |
318 | fprintf(stderr, "Cannot load security key %s without " | 319 | fprintf(stderr, "Cannot load security key %s without " |