summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshkey.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-06-22 05:58:35 +0000
committerdjm <djm@openbsd.org>2020-06-22 05:58:35 +0000
commitc25c45ac5c037f909a29d0baed332c4fbcf1043b (patch)
tree93cd3904fcae4b6b10c2b281f1effde49ee03dc2 /usr.bin/ssh/sshkey.c
parentrefactor ECDSA-SK verification a little ahead of adding support (diff)
downloadwireguard-openbsd-c25c45ac5c037f909a29d0baed332c4fbcf1043b.tar.xz
wireguard-openbsd-c25c45ac5c037f909a29d0baed332c4fbcf1043b.zip
Add support for FIDO webauthn (verification only). webauthn is a
standard for using FIDO keys in web browsers. webauthn signatures are a slightly different format to plain FIDO signatures - this support allows verification of these. Feedback and ok markus@
Diffstat (limited to '')
-rw-r--r--usr.bin/ssh/sshkey.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index f0450f3b4b8..60736cd8c55 100644
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.108 2020/04/11 10:16:11 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.109 2020/06/22 05:58:35 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -122,6 +122,8 @@ static const struct keytype keytypes[] = {
KEY_ECDSA, NID_secp521r1, 0, 0 },
{ "sk-ecdsa-sha2-nistp256@openssh.com", "ECDSA-SK", NULL,
KEY_ECDSA_SK, NID_X9_62_prime256v1, 0, 0 },
+ { "webauthn-sk-ecdsa-sha2-nistp256@openssh.com", "ECDSA-SK", NULL,
+ KEY_ECDSA_SK, NID_X9_62_prime256v1, 0, 1 },
{ "ssh-rsa-cert-v01@openssh.com", "RSA-CERT", NULL,
KEY_RSA_CERT, 0, 1, 0 },
{ "rsa-sha2-256-cert-v01@openssh.com", "RSA-CERT",