summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-02-04 09:58:04 +0000
committerdjm <djm@openbsd.org>2020-02-04 09:58:04 +0000
commit67d0e46d308e94877e514ef9fdbbdd6fe912344a (patch)
tree56c00f2f3ab47e0b263b82b0cf229656ee8d58cf /usr.bin/ssh/ssh-keygen.c
parentReplace TAILQ concatenation loop with TAILQ_CONCAT (diff)
downloadwireguard-openbsd-67d0e46d308e94877e514ef9fdbbdd6fe912344a.tar.xz
wireguard-openbsd-67d0e46d308e94877e514ef9fdbbdd6fe912344a.zip
require FIDO application strings to start with "ssh:"; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 03145b4ddff..ac43c73bff9 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -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>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3547,6 +3547,10 @@ main(int argc, char **argv)
} else if (strncasecmp(opts[i],
"application=", 12) == 0) {
sk_application = xstrdup(opts[i] + 12);
+ if (strncmp(sk_application, "ssh:", 4) != 0) {
+ fatal("FIDO application string must "
+ "begin with \"ssh:\"");
+ }
} else {
fatal("Option \"%s\" is unsupported for "
"FIDO authenticator enrollment", opts[i]);