summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-25 00:55:58 +0000
committerDamien Miller <djm@mindrot.org>2019-11-25 12:25:30 +1100
commitdaeaf4136927c2a82af1399022103d67ff03f74a (patch)
treeae36ea4af1bd3fcc57813bfa71eca4cceef0efe9 /ssh-keygen.1
parent2e71263b80fec7ad977e098004fef7d122169d40 (diff)
upstream: allow "ssh-keygen -x no-touch-required" when generating a
security key keypair to request one that does not require a touch for each authentication attempt. The default remains to require touch. feedback deraadt; ok markus@ OpenBSD-Commit-ID: 887e7084b2e89c0c62d1598ac378aad8e434bcbd
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.111
1 files changed, 10 insertions, 1 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 06aead348..837238e4e 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.177 2019/11/25 00:54:23 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.178 2019/11/25 00:55:58 djm Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -679,6 +679,15 @@ internal support for USB HID keys.
679.It Fl x Ar flags 679.It Fl x Ar flags
680Specifies the security key flags to use when enrolling a security key-hosted 680Specifies the security key flags to use when enrolling a security key-hosted
681key. 681key.
682Flags may be specified by name or directly as a hexadecimal value.
683Only one named flag is supported at present:
684.Cm no-touch-required ,
685which indicates that the generated private key should not require touch
686events (user presence) when making signatures.
687Note that
688.Xr sshd 8
689will refuse such signatures by default, unless overridden via
690an authorized_keys option.
682.It Fl y 691.It Fl y
683This option will read a private 692This option will read a private
684OpenSSH format file and print an OpenSSH public key to stdout. 693OpenSSH format file and print an OpenSSH public key to stdout.