summaryrefslogtreecommitdiffstats
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-02-04 10:58:04 +0100
committerDamien Miller <djm@mindrot.org>2020-02-04 11:08:10 +0100
commitd596b1d30dc158915a3979fa409d21ff2465b6ee (patch)
treec7c5d1c14cbd5e2e2448043d69b4dc383c56effb /ssh-keygen.1
parentupstream: revert enabling UpdateHostKeys by default - there are still (diff)
downloadopenssh-d596b1d30dc158915a3979fa409d21ff2465b6ee.tar.xz
openssh-d596b1d30dc158915a3979fa409d21ff2465b6ee.zip
upstream: require FIDO application strings to start with "ssh:"; ok
markus@ OpenBSD-Commit-ID: 94e9c1c066d42b76f035a3d58250a32b14000afb
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.16
1 files changed, 4 insertions, 2 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index f0e76aab1..51aee21aa 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.199 2020/02/03 08:15:37 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.200 2020/02/04 09:58:04 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: February 3 2020 $
+.Dd $Mdocdate: February 4 2020 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -472,6 +472,8 @@ Those supported at present are:
Override the default FIDO application/origin string of
.Dq ssh: .
This may be useful when generating host or domain-specific resident keys.
+The specified application string must begin with
+.Dq ssh: .
.It Cm challenge Ns = Ns Ar path
Specifies a path to a challenge string that will be passed to the
FIDO token during key generation.