token2/libfido2
0
0
Fork 0
mirror of https://github.com/token2/libfido2.git synced 2026-03-13 11:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

assert: fix use of fido_dev_can_get_uv_token()

Browse Source 
use fido_dev_can_get_uv_token() to decide whether to call
fido_do_ecdh(), and check the derived pk and ecdh pointers to know
when to append cbor uv parameters to a particular assertion.
This commit is contained in:
pedro martelletto
2021-03-23 17:46:29 +01:00
committed by Konstantinos Georgantas
parent a9de31b336
commit 8715f337f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/assert.c
View File

@@ -132,7 +132,7 @@ fido_dev_get_assert_tx(fido_dev_t *dev, fido_assert_t *assert,
}
/* user verification */
if (fido_dev_can_get_uv_token(dev, pin, assert->uv))
if (pk != NULL && ecdh != NULL)
if ((r = cbor_add_uv_params(dev, cmd, &assert->cdh, pk, ecdh,
pin, assert->rp_id, &argv[5], &argv[6])) != FIDO_OK) {
fido_log_debug("%s: cbor_add_uv_params", __func__);
@@ -297,7 +297,7 @@ fido_dev_get_assert(fido_dev_t *dev, fido_assert_t *assert, const char *pin)
return (u2f_authenticate(dev, assert, -1));
}
if (pin != NULL || assert->uv == FIDO_OPT_TRUE ||
if (fido_dev_can_get_uv_token(dev, pin, assert->uv) ||
(assert->ext.mask & FIDO_EXT_HMAC_SECRET)) {
if ((r = fido_do_ecdh(dev, &pk, &ecdh)) != FIDO_OK) {
fido_log_debug("%s: fido_do_ecdh", __func__);