upstream: U2F tokens may return FIDO_ERR_USER_PRESENCE_REQUIRED when

probed to see if they own a key handle. Handle this case so the find_device()
look can work for them. Reported by Michael Forney

OpenBSD-Commit-ID: 2ccd5b30a6ddfe4dba228b7159bf168601bd9166

diff --git a/sk-usbhid.c b/sk-usbhid.c
index f81dc8f28ed315a2e6efa42c2e0b9b63f945495e..e07b49e9fa4fbc89555c36c15668c7729bb77a4a 100644 (file)
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -201,6 +201,10 @@ try_device(fido_dev_t *dev, const uint8_t *message, size_t message_len,
        }
        r = fido_dev_get_assert(dev, assert, NULL);
        skdebug(__func__, "fido_dev_get_assert: %s", fido_strerr(r));
+       if (r == FIDO_ERR_USER_PRESENCE_REQUIRED) {
+               /* U2F tokens may return this */
+               r = FIDO_OK;
+       }
  out:
        fido_assert_free(&assert);