diff options
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.203 2019/11/25 00:52:46 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.204 2019/11/25 00:54:23 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -1440,7 +1440,8 @@ mm_answer_keyverify(struct ssh *ssh, int sock, struct sshbuf *m) | |||
1440 | 1440 | ||
1441 | if (ret == 0 && key_blobtype == MM_USERKEY && sig_details != NULL) { | 1441 | if (ret == 0 && key_blobtype == MM_USERKEY && sig_details != NULL) { |
1442 | req_presence = (options.pubkey_auth_options & | 1442 | req_presence = (options.pubkey_auth_options & |
1443 | PUBKEYAUTH_TOUCH_REQUIRED); | 1443 | PUBKEYAUTH_TOUCH_REQUIRED) || |
1444 | !key_opts->no_require_user_presence; | ||
1444 | if (req_presence && | 1445 | if (req_presence && |
1445 | (sig_details->sk_flags & SSH_SK_USER_PRESENCE_REQD) == 0) { | 1446 | (sig_details->sk_flags & SSH_SK_USER_PRESENCE_REQD) == 0) { |
1446 | error("public key %s %s signature for %s%s from %.128s " | 1447 | error("public key %s %s signature for %s%s from %.128s " |