diff options
| author |   markus <markus@openbsd.org> | 2019-11-12 19:33:08 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2019-11-12 19:33:08 +0000 |
| commit | 27c8f7c6c72a5404ae19ebeda58c88a77fee57d4 (patch) | |
| tree | ac8e600a5bc4b2f2c0aaf489a48498a7cf96f771 /usr.bin/ssh/ssh-add.c | |
| parent | update sk-api to version 2 for ed25519 support; ok djm (diff) | |
| download | wireguard-openbsd-27c8f7c6c72a5404ae19ebeda58c88a77fee57d4.tar.xz wireguard-openbsd-27c8f7c6c72a5404ae19ebeda58c88a77fee57d4.zip | |
enable ed25519 support; ok djm
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
| -rw-r--r-- | usr.bin/ssh/ssh-add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index 6d7484fdd4b..9a6e8b54c9e 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.143 2019/10/31 21:19:56 djm Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.144 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 @@ -73,6 +73,7 @@ static char *default_files[] = { _PATH_SSH_CLIENT_ID_ECDSA, _PATH_SSH_CLIENT_ID_ECDSA_SK, _PATH_SSH_CLIENT_ID_ED25519, + _PATH_SSH_CLIENT_ID_ED25519_SK, _PATH_SSH_CLIENT_ID_XMSS, NULL }; @@ -304,7 +305,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag, ssh_free_identitylist(idlist); } - if (sshkey_type_plain(private->type) != KEY_ECDSA_SK) + if (!sshkey_is_sk(private)) skprovider = NULL; /* Don't send constraint for other keys */ else if (skprovider == NULL) { fprintf(stderr, "Cannot load security key %s without " |