RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-07 07:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: skip a bit more FIDO token selection logic when only a

Browse Source 
single token is attached.

with Pedro Martelletto

OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac
This commit is contained in:
djm@openbsd.org 2020-08-27 09:43:28 +00:00 committed by Damien Miller
parent 744df42a12
commit b969072cc3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sk-usbhid.c
View File

@ -367,8 +367,13 @@ sk_select_by_cred(const fido_dev_info_t *devlist, size_t ndevs,
skdebug(__func__, "sk_openv failed"); skdebug(__func__, "sk_openv failed");
return NULL; return NULL;
} }
if (skvcnt == 1) {
sk = skv[0];
skv[0] = NULL;
goto out;
}
sk = NULL; sk = NULL;
for (i = 0; i < skvcnt; i++) for (i = 0; i < skvcnt; i++) {
if (sk_try(skv[i], application, key_handle, if (sk_try(skv[i], application, key_handle,
key_handle_len) == 0) { key_handle_len) == 0) {
sk = skv[i]; sk = skv[i];
@ -376,6 +381,8 @@ sk_select_by_cred(const fido_dev_info_t *devlist, size_t ndevs,
skdebug(__func__, "found key in %s", sk->path); skdebug(__func__, "found key in %s", sk->path);
break; break;
} }
}
out:
sk_closev(skv, skvcnt); sk_closev(skv, skvcnt);
return sk; return sk;
} }