diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-02-28 01:07:28 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-02-28 12:27:41 +1100 |
| commit | 9b47bd7b09d191991ad9e0506bb66b74bbc93d34 (patch) | |
| tree | 7cb6eb3869883597604277502a9433cbab7f7bc7 | |
| parent | dd992520bed35387fc010239abe1bdc0c2665e38 (diff) | |
upstream: no-touch-required certificate option should be an
extension, not a critical option.
OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d
| -rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index d9c207b42..b652bbbfc 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssh-keygen.c,v 1.399 2020/02/26 13:40:09 jsg Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.400 2020/02/28 01:07:28 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| @@ -1670,7 +1670,7 @@ prepare_options_buf(struct sshbuf *c, int which) | |||
| 1670 | if ((which & OPTIONS_EXTENSIONS) != 0 && | 1670 | if ((which & OPTIONS_EXTENSIONS) != 0 && |
| 1671 | (certflags_flags & CERTOPT_USER_RC) != 0) | 1671 | (certflags_flags & CERTOPT_USER_RC) != 0) |
| 1672 | add_flag_option(c, "permit-user-rc"); | 1672 | add_flag_option(c, "permit-user-rc"); |
| 1673 | if ((which & OPTIONS_CRITICAL) != 0 && | 1673 | if ((which & OPTIONS_EXTENSIONS) != 0 && |
| 1674 | (certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) | 1674 | (certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) |
| 1675 | add_flag_option(c, "no-touch-required"); | 1675 | add_flag_option(c, "no-touch-required"); |
| 1676 | if ((which & OPTIONS_CRITICAL) != 0 && | 1676 | if ((which & OPTIONS_CRITICAL) != 0 && |