summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-12-30 09:19:52 +0000
committerdjm <djm@openbsd.org>2019-12-30 09:19:52 +0000
commit8908bc36f69747a58babc01639b383f954dcab32 (patch)
treea0c724848264b3c469ecc81f2e64055e7e58fe76 /usr.bin/ssh/ssh-keygen.c
parentremove single-letter flags for moduli options (diff)
downloadwireguard-openbsd-8908bc36f69747a58babc01639b383f954dcab32.tar.xz
wireguard-openbsd-8908bc36f69747a58babc01639b383f954dcab32.zip
basic support for generating FIDO2 resident keys
"ssh-keygen -t ecdsa-sk|ed25519-sk -x resident" will generate a device-resident key. feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 34c65121d5a..eaafbf2b096 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.376 2019/12/30 03:30:09 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.377 2019/12/30 09:19:52 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3116,6 +3116,8 @@ main(int argc, char **argv)
fatal("Missing security key flags");
if (strcasecmp(optarg, "no-touch-required") == 0)
sk_flags &= ~SSH_SK_USER_PRESENCE_REQD;
+ else if (strcasecmp(optarg, "resident") == 0)
+ sk_flags |= SSH_SK_RESIDENT_KEY;
else {
ull = strtoull(optarg, &ep, 0);
if (*ep != '\0')