upstream: no-touch-required certificate option should be an

extension, not a critical option.

OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0d6ed1fff2c55520872bd3c3d5119b15506ffe6e..bf325cd61da31efc98f5a6b8a9fa5034d4b25b97 100644 (file)
--- 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 &&