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-sk-helper.c | |
parent | fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff) |
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'ssh-sk-helper.c')
-rw-r--r-- | ssh-sk-helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c index a996f5898..0acb8d172 100644 --- a/ssh-sk-helper.c +++ b/ssh-sk-helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-sk-helper.c,v 1.2 2019/11/12 19:30:50 markus Exp $ */ | 1 | /* $OpenBSD: ssh-sk-helper.c,v 1.3 2019/11/12 19:33:08 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Google LLC | 3 | * Copyright (c) 2019 Google LLC |
4 | * | 4 | * |
@@ -114,7 +114,7 @@ main(int argc, char **argv) | |||
114 | if ((r = sshbuf_froms(req, &kbuf)) != 0 || | 114 | if ((r = sshbuf_froms(req, &kbuf)) != 0 || |
115 | (r = sshkey_private_deserialize(kbuf, &key)) != 0) | 115 | (r = sshkey_private_deserialize(kbuf, &key)) != 0) |
116 | fatal("Unable to parse key: %s", ssh_err(r)); | 116 | fatal("Unable to parse key: %s", ssh_err(r)); |
117 | if (sshkey_type_plain(key->type) != KEY_ECDSA_SK) | 117 | if (!sshkey_is_sk(key)) |
118 | fatal("Unsupported key type %s", sshkey_ssh_name(key)); | 118 | fatal("Unsupported key type %s", sshkey_ssh_name(key)); |
119 | 119 | ||
120 | if ((r = sshbuf_get_cstring(req, &provider, NULL)) != 0 || | 120 | if ((r = sshbuf_get_cstring(req, &provider, NULL)) != 0 || |