upstream: 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@

OpenBSD-Commit-ID: 8e1b3c56a4b11d85047bd6c6c705b7eef4d58431

1 files changed, 3 insertions, 1 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 447810fb1..48342c09d 100644
--- a/ssh-keygen.c
+++ b/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
@@ -3135,6 +3135,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')