summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-08-27 01:08:45 +0000
committerDamien Miller <djm@mindrot.org>2020-08-27 11:28:36 +1000
commit0caff05350bd5fc635674c9e051a0322faba5ae3 (patch)
tree971d44e6f922a89746ae7b1453dda4223f9b76f8 /ssh-keygen.1
parentb649b3daa6d4b8ebe1bd6de69b3db5d2c03c9af0 (diff)
downloadopenssh-git-0caff05350bd5fc635674c9e051a0322faba5ae3.tar.gz
upstream: Request PIN ahead of time for certain FIDO actions
When we know that a particular action will require a PIN, such as downloading resident keys or generating a verify-required key, request the PIN before attempting it. joint work with Pedro Martelletto; ok markus@ OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.14
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 7e0558fe..e18fcde0 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.206 2020/08/27 01:06:18 djm Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.207 2020/08/27 01:08:45 djm Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -382,6 +382,8 @@ The default import format is
Download resident keys from a FIDO authenticator.
Public and private key files will be written to the current directory for
each downloaded key.
+If multiple FIDO authenticators are attached, keys will be downloaded from
+the first touched authenticator.
.It Fl k
Generate a KRL file.
In this mode,