diff options
| author |   djm <djm@openbsd.org> | 2020-02-28 01:07:28 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-02-28 01:07:28 +0000 |
| commit | 7f7f59481fe68c30dbbbbab6c61baffcc14e5045 (patch) | |
| tree | 5421643cc0fc60292a14499c2e998b8266d592e9 /usr.bin/ssh/ssh-keygen.c | |
| parent | better error message when trying to use a FIDO key function and (diff) | |
| download | wireguard-openbsd-7f7f59481fe68c30dbbbbab6c61baffcc14e5045.tar.xz wireguard-openbsd-7f7f59481fe68c30dbbbbab6c61baffcc14e5045.zip | |
no-touch-required certificate option should be an extension, not
a critical option.
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 2564e130261..968b24143c6 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.399 2020/02/26 13:40:09 jsg Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.400 2020/02/28 01:07:28 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1648,7 +1648,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 && |