1 files changed, 24 insertions, 67 deletions

diff --git a/src/hid_openbsd.c b/src/hid_openbsd.c
index 2b31dba..319f7b8 100644
--- a/src/hid_openbsd.c
+++ b/src/hid_openbsd.c
@@ -8,19 +8,16 @@
 
 #include <sys/ioctl.h>
 #include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
-#include <usbhid.h>
 #include <poll.h>
 
 #include "fido.h"
 
 #define MAX_UHID        64
-#define MAX_REPORT_LEN  (sizeof(((struct usb_ctl_report *)(NULL))->ucr_data))
 
 struct hid_openbsd {
         int fd;
@@ -33,11 +30,8 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
 {
         size_t i;
         char path[64];
-        int is_fido, fd;
+        int fd;
         struct usb_device_info udi;
-        report_desc_t rdesc = NULL;
-        hid_data_t hdata = NULL;
-        hid_item_t hitem;
         fido_dev_info_t *di;
 
         if (ilen == 0)
@@ -47,7 +41,7 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
                 return (FIDO_ERR_INVALID_ARGUMENT);
 
         for (i = *olen = 0; i < MAX_UHID && *olen < ilen; i++) {
-                snprintf(path, sizeof(path), "/dev/uhid%zu", i);
+                snprintf(path, sizeof(path), "/dev/fido/%zu", i);
                 if ((fd = open(path, O_RDWR)) == -1) {
                         if (errno != ENOENT && errno != ENXIO) {
                                 fido_log_debug("%s: open %s: %s", __func__,
@@ -55,6 +49,7 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
                         }
                         continue;
                 }
+
                 memset(&udi, 0, sizeof(udi));
                 if (ioctl(fd, USB_GET_DEVICEINFO, &udi) != 0) {
                         fido_log_debug("%s: get device info %s: %s", __func__,
@@ -62,35 +57,8 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
                         close(fd);
                         continue;
                 }
-                if ((rdesc = hid_get_report_desc(fd)) == NULL) {
-                        fido_log_debug("%s: failed to get report descriptor: %s",
-                            __func__, path);
-                        close(fd);
-                        continue;
-                }
-                if ((hdata = hid_start_parse(rdesc,
-                    1<<hid_collection, -1)) == NULL) {
-                        fido_log_debug("%s: failed to parse report descriptor: %s",
-                            __func__, path);
-                        hid_dispose_report_desc(rdesc);
-                        close(fd);
-                        continue;
-                }
-                is_fido = 0;
-                for (is_fido = 0; !is_fido;) {
-                        memset(&hitem, 0, sizeof(hitem));
-                        if (hid_get_item(hdata, &hitem) <= 0)
-                                break;
-                        if ((hitem._usage_page & 0xFFFF0000) == 0xf1d00000)
-                                is_fido = 1;
-                }
-                hid_end_parse(hdata);
-                hid_dispose_report_desc(rdesc);
                 close(fd);
 
-                if (!is_fido)
-                        continue;
-
                 fido_log_debug("%s: %s: bus = 0x%02x, addr = 0x%02x",
                     __func__, path, udi.udi_bus, udi.udi_addr);
                 fido_log_debug("%s: %s: vendor = \"%s\", product = \"%s\"",
@@ -116,8 +84,8 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
                         explicit_bzero(di, sizeof(*di));
                         return FIDO_ERR_INTERNAL;
                 }
-                di->vendor_id = udi.udi_vendorNo;
-                di->product_id = udi.udi_productNo;
+                di->vendor_id = (int16_t)udi.udi_vendorNo;
+                di->product_id = (int16_t)udi.udi_productNo;
                 (*olen)++;
         }
 
@@ -184,42 +152,15 @@ void *
 fido_hid_open(const char *path)
 {
         struct hid_openbsd *ret = NULL;
-        report_desc_t rdesc = NULL;
-        int len, usb_report_id = 0;
 
         if ((ret = calloc(1, sizeof(*ret))) == NULL ||
             (ret->fd = open(path, O_RDWR)) < 0) {
                 free(ret);
                 return (NULL);
         }
-        if (ioctl(ret->fd, USB_GET_REPORT_ID, &usb_report_id) != 0) {
-                fido_log_debug("%s: failed to get report ID: %s", __func__,
-                    strerror(errno));
-                goto fail;
-        }
-        if ((rdesc = hid_get_report_desc(ret->fd)) == NULL) {
-                fido_log_debug("%s: failed to get report descriptor", __func__);
-                goto fail;
-        }
-        if ((len = hid_report_size(rdesc, hid_input, usb_report_id)) <= 0 ||
-            (size_t)len > MAX_REPORT_LEN) {
-                fido_log_debug("%s: bad input report size %d", __func__, len);
-                goto fail;
-        }
-        ret->report_in_len = (size_t)len;
-        if ((len = hid_report_size(rdesc, hid_output, usb_report_id)) <= 0 ||
-            (size_t)len > MAX_REPORT_LEN) {
-                fido_log_debug("%s: bad output report size %d", __func__, len);
- fail:
-                hid_dispose_report_desc(rdesc);
-                close(ret->fd);
-                free(ret);
-                return NULL;
-        }       
-        ret->report_out_len = (size_t)len;
-        hid_dispose_report_desc(rdesc);
-        fido_log_debug("%s: USB report ID %d, inlen = %zu outlen = %zu",
-            __func__, usb_report_id, ret->report_in_len, ret->report_out_len);
+        ret->report_in_len = ret->report_out_len = CTAP_MAX_REPORT_LEN;
+        fido_log_debug("%s: inlen = %zu outlen = %zu", __func__,
+            ret->report_in_len, ret->report_out_len);
 
         /*
          * OpenBSD (as of 201910) has a bug that causes it to lose
@@ -281,3 +222,19 @@ fido_hid_write(void *handle, const unsigned char *buf, size_t len)
         }
         return ((int)len);
 }
+
+size_t
+fido_hid_report_in_len(void *handle)
+{
+        struct hid_openbsd *ctx = handle;
+
+        return (ctx->report_in_len);
+}
+
+size_t
+fido_hid_report_out_len(void *handle)
+{
+        struct hid_openbsd *ctx = handle;
+
+        return (ctx->report_out_len);
+}