summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-02-28 01:07:28 +0000
committerDamien Miller <djm@mindrot.org>2020-02-28 12:28:46 +1100
commite1dc1931cda704e544b80e438a1fd36f986aef2a (patch)
treef5fe57e4c296b64c191a7a0106bd871a181e8e27
parent24b8bc578d076697d4d3c34584ea869e37fd50e7 (diff)
upstream: no-touch-required certificate option should be anV_8_2
extension, not a critical option. OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d
-rw-r--r--ssh-keygen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0d6ed1ff..bf325cd6 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1678,7 +1678,7 @@ prepare_options_buf(struct sshbuf *c, int which)
if ((which & OPTIONS_EXTENSIONS) != 0 &&
(certflags_flags & CERTOPT_USER_RC) != 0)
add_flag_option(c, "permit-user-rc");
- if ((which & OPTIONS_CRITICAL) != 0 &&
+ if ((which & OPTIONS_EXTENSIONS) != 0 &&
(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0)
add_flag_option(c, "no-touch-required");
if ((which & OPTIONS_CRITICAL) != 0 &&