diff options
| author |   djm <djm@openbsd.org> | 2020-09-07 01:09:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-09-07 01:09:47 +0000 |
| commit | 6558ed23a80af04730a90ecefd3d20a45942ede5 (patch) | |
| tree | 68268d07fce0a786998550c1beff3c19d7f47571 /lib/libfido2/src | |
| parent | Add RK3308 clocks (diff) | |
| download | wireguard-openbsd-6558ed23a80af04730a90ecefd3d20a45942ede5.tar.xz wireguard-openbsd-6558ed23a80af04730a90ecefd3d20a45942ede5.zip | |
sync a couple of minor fixes (no API/ABI change) to bring libfido2
in line with upstream 1.5.0
Diffstat (limited to 'lib/libfido2/src')
| -rw-r--r-- | lib/libfido2/src/dev.c | 3 | ||||
| -rw-r--r-- | lib/libfido2/src/u2f.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libfido2/src/dev.c b/lib/libfido2/src/dev.c index c84962cd96e..3463ae41d01 100644 --- a/lib/libfido2/src/dev.c +++ b/lib/libfido2/src/dev.c @@ -468,9 +468,10 @@ fido_dev_get_touch_status(fido_dev_t *dev, int *touched, int ms) return (u2f_get_touch_status(dev, touched, ms)); switch ((r = fido_rx_cbor_status(dev, ms))) { - case FIDO_ERR_PIN_INVALID: case FIDO_ERR_PIN_AUTH_INVALID: + case FIDO_ERR_PIN_INVALID: case FIDO_ERR_PIN_NOT_SET: + case FIDO_ERR_SUCCESS: *touched = 1; break; case FIDO_ERR_RX: diff --git a/lib/libfido2/src/u2f.c b/lib/libfido2/src/u2f.c index 406186a51b0..3c6ea82731d 100644 --- a/lib/libfido2/src/u2f.c +++ b/lib/libfido2/src/u2f.c @@ -835,7 +835,6 @@ u2f_get_touch_status(fido_dev_t *dev, int *touched, int ms) switch ((reply[reply_len - 2] << 8) | reply[reply_len - 1]) { case SW_CONDITIONS_NOT_SATISFIED: - usleep(200 * 1000); /* per spec (Chrome) */ if ((r = u2f_get_touch_begin(dev)) != FIDO_OK) { fido_log_debug("%s: u2f_get_touch_begin", __func__); return (r); |