mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-27 07:44:29 +02:00
upstream: require FIDO application strings to start with "ssh:"; ok
markus@ OpenBSD-Commit-ID: 94e9c1c066d42b76f035a3d58250a32b14000afb
This commit is contained in:
parent
501f358243
commit
d596b1d30d
@ -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>
|
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
.\" 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
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" 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
|
.Dt SSH-KEYGEN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -472,6 +472,8 @@ Those supported at present are:
|
|||||||
Override the default FIDO application/origin string of
|
Override the default FIDO application/origin string of
|
||||||
.Dq ssh: .
|
.Dq ssh: .
|
||||||
This may be useful when generating host or domain-specific resident keys.
|
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
|
.It Cm challenge Ns = Ns Ar path
|
||||||
Specifies a path to a challenge string that will be passed to the
|
Specifies a path to a challenge string that will be passed to the
|
||||||
FIDO token during key generation.
|
FIDO token during key generation.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: ssh-keygen.c,v 1.395 2020/01/28 08:01:34 djm Exp $ */
|
/* $OpenBSD: ssh-keygen.c,v 1.396 2020/02/04 09:58:04 djm Exp $ */
|
||||||
/*
|
/*
|
||||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
@ -3572,6 +3572,10 @@ main(int argc, char **argv)
|
|||||||
} else if (strncasecmp(opts[i],
|
} else if (strncasecmp(opts[i],
|
||||||
"application=", 12) == 0) {
|
"application=", 12) == 0) {
|
||||||
sk_application = xstrdup(opts[i] + 12);
|
sk_application = xstrdup(opts[i] + 12);
|
||||||
|
if (strncmp(sk_application, "ssh:", 4) != 0) {
|
||||||
|
fatal("FIDO application string must "
|
||||||
|
"begin with \"ssh:\"");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
fatal("Option \"%s\" is unsupported for "
|
fatal("Option \"%s\" is unsupported for "
|
||||||
"FIDO authenticator enrollment", opts[i]);
|
"FIDO authenticator enrollment", opts[i]);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user