tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: when downloading FIDO2 resident keys from a token, don't 

prompt for a PIN until the token has told us that it needs one. Avoids
double-prompting on devices that implement on-device authentication (e.g. a
touchscreen PIN pad on the Trezor Model T). ok dtucker@

OpenBSD-Commit-ID: 38b78903dd4422d7d3204095a31692fb69130817
This commit is contained in:
djm@openbsd.org 2020-03-13 03:12:17 +00:00 committed by Damien Miller
parent 955c4cf4c6
commit c084a2d040
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.402 2020/03/06 18:29:14 markus Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.403 2020/03/13 03:12:17 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2960,19 +2960,26 @@ do_download_sk(const char *skprovider, const char *device)
struct sshkey **keys; struct sshkey **keys;
size_t nkeys, i; size_t nkeys, i;
int r, ok = -1; int r, ok = -1;
char *fp, *pin, *pass = NULL, *path, *pubpath; char *fp, *pin = NULL, *pass = NULL, *path, *pubpath;
const char *ext; const char *ext;
if (skprovider == NULL) if (skprovider == NULL)
fatal("Cannot download keys without provider"); fatal("Cannot download keys without provider");
pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); for (i = 0; i < 2; i++) {
if (i == 1) {
pin = read_passphrase("Enter PIN for authenticator: ",
RP_ALLOW_STDIN);
}
if ((r = sshsk_load_resident(skprovider, device, pin, if ((r = sshsk_load_resident(skprovider, device, pin,
&keys, &nkeys)) != 0) { &keys, &nkeys)) != 0) {
if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE)
continue;
freezero(pin, strlen(pin)); freezero(pin, strlen(pin));
error("Unable to load resident keys: %s", ssh_err(r)); error("Unable to load resident keys: %s", ssh_err(r));
return -1; return -1;
} }
}
if (nkeys == 0) if (nkeys == 0)
logit("No keys to download"); logit("No keys to download");
freezero(pin, strlen(pin)); freezero(pin, strlen(pin));