summaryrefslogtreecommitdiffstats
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-01-02 23:40:09 +0100
committerDamien Miller <djm@mindrot.org>2020-01-02 23:43:24 +0100
commit9039971887cccd95b209c479296f772a3a93e8e7 (patch)
tree935303f0db7914aa9011132be61e05f58a3e6c98 /ssh-keygen.1
parentupstream: add sshkey_save_public(), to save a public key; ok (diff)
downloadopenssh-9039971887cccd95b209c479296f772a3a93e8e7.tar.xz
openssh-9039971887cccd95b209c479296f772a3a93e8e7.zip
upstream: ability to download FIDO2 resident keys from a token via
"ssh-keygen -K". This will save public/private keys into the current directory. This is handy if you move a token between hosts. feedback & ok markus@ OpenBSD-Commit-ID: d57c1f9802f7850f00a117a1d36682a6c6d10da6
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.111
1 files changed, 9 insertions, 2 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index f0d70adec..569a46b19 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.186 2019/12/30 16:10:00 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.187 2020/01/02 22:40:09 djm Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 30 2019 $
+.Dd $Mdocdate: January 2 2020 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -92,6 +92,9 @@
.Fl H
.Op Fl f Ar known_hosts_file
.Nm ssh-keygen
+.Fl K
+.Op Fl w Ar provider
+.Nm ssh-keygen
.Fl R Ar hostname
.Op Fl f Ar known_hosts_file
.Nm ssh-keygen
@@ -363,6 +366,10 @@ commercial SSH implementations.
The default import format is
.Dq RFC4716 .
.It Fl k
+Download resident keys from a FIDO authenticator.
+Public and private key files will be written to the current directory for
+each downloaded key.
+.It Fl k
Generate a KRL file.
In this mode,
.Nm