tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: sk-usbhid: fix key_lookup() on tokens with built-in UV

Browse Source 
explicitly test whether the token performs built-in UV (e.g. biometric
tokens) and enable UV in that case. From Pedro Martelletto via GHPR#388

OpenBSD-Commit-ID: 007eb7e387d27cf3029ab06b88224e03eca62ccd
This commit is contained in:
djm@openbsd.org 2022-09-02 04:20:02 +00:00 committed by Damien Miller
parent 03277a4aa4
commit 5f45c2395c
No known key found for this signature in database
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sk-usbhid.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sk-usbhid.c,v 1.43 2022/08/19 05:53:28 djm Exp $ */ /* $OpenBSD: sk-usbhid.c,v 1.44 2022/09/02 04:20:02 djm Exp $ */
/* /*
* Copyright (c) 2019 Markus Friedl * Copyright (c) 2019 Markus Friedl
* Copyright (c) 2020 Pedro Martelletto * Copyright (c) 2020 Pedro Martelletto
@ -783,6 +783,7 @@ key_lookup(fido_dev_t *dev, const char *application, const uint8_t *user_id,
fido_assert_t *assert = NULL; fido_assert_t *assert = NULL;
uint8_t message[32]; uint8_t message[32];
int r = FIDO_ERR_INTERNAL; int r = FIDO_ERR_INTERNAL;
int sk_supports_uv, uv;
size_t i; size_t i;
memset(message, '\0', sizeof(message)); memset(message, '\0', sizeof(message));
@ -802,7 +803,15 @@ key_lookup(fido_dev_t *dev, const char *application, const uint8_t *user_id,
goto out; goto out;
} }
if ((r = fido_assert_set_up(assert, FIDO_OPT_FALSE)) != FIDO_OK) { if ((r = fido_assert_set_up(assert, FIDO_OPT_FALSE)) != FIDO_OK) {
skdebug(__func__, "fido_assert_up: %s", fido_strerr(r)); skdebug(__func__, "fido_assert_set_up: %s", fido_strerr(r));
goto out;
}
uv = FIDO_OPT_OMIT;
if (pin == NULL && check_sk_options(dev, "uv", &sk_supports_uv) == 0 &&
sk_supports_uv != -1)
uv = FIDO_OPT_TRUE;
if ((r = fido_assert_set_uv(assert, uv)) != FIDO_OK) {
skdebug(__func__, "fido_assert_set_uv: %s", fido_strerr(r));
goto out; goto out;
} }
if ((r = fido_dev_get_assert(dev, assert, pin)) != FIDO_OK) { if ((r = fido_dev_get_assert(dev, assert, pin)) != FIDO_OK) {