diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-08-05 05:01:40 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-08-05 15:03:40 +1000 |
| commit | 2a108c0ea960381bd9b14ee0d84e818a23df4482 (patch) | |
| tree | f2c4ea8c56ac6bc6915bf5541394f163391066fe /ssh-keygen.c | |
| parent | 2886975c0ad9244e60dc5e4be34fde3aa573a4b5 (diff) | |
| download | openssh-git-2a108c0ea960381bd9b14ee0d84e818a23df4482.tar.gz | |
upstream: don't prompt for FIDO passphrase before attempting to enroll
the credential, just let the enroll operating fail and we'll attempt to get a
PIN anyway. Might avoid some unneccessary PIN prompts.
Part of GHPR#302 from Corinna Vinschen; ok dtucker@
OpenBSD-Commit-ID: bd5342ffc353ee37d39617906867c305564d1ce2
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 77f79013..20b321cc 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.457 2022/07/20 03:33:22 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.458 2022/08/05 05:01:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3288,7 +3288,7 @@ usage(void) int main(int argc, char **argv) { - char comment[1024], *passphrase; + char comment[1024], *passphrase = NULL; char *rr_hostname = NULL, *ep, *fp, *ra; struct sshkey *private, *public; struct passwd *pw; @@ -3801,13 +3801,6 @@ main(int argc, char **argv) } if ((attest = sshbuf_new()) == NULL) fatal("sshbuf_new failed"); - if ((sk_flags & - (SSH_SK_USER_VERIFICATION_REQD|SSH_SK_RESIDENT_KEY))) { - passphrase = read_passphrase("Enter PIN for " - "authenticator: ", RP_ALLOW_STDIN); - } else { - passphrase = NULL; - } r = 0; for (i = 0 ;;) { if (!quiet) { |