Merge pull request #1 from robin-nitrokey/usage-shimunn

Merge shimunn#8
sb-child · Aug 13, 2024 · dbc871e · dbc871e
2 parents bf862f6 + 29f684c
commit dbc871e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/examples/list.rs b/examples/list.rs
@@ -0,0 +1,5 @@
+fn main() {
+    for device in ctap_hmac::get_devices().unwrap() {
+        println!("{device:?}");
+    }
+}
diff --git a/src/hid_linux.rs b/src/hid_linux.rs
@@ -58,10 +58,12 @@ fn path_to_device(path: &PathBuf) -> io::Result<DeviceInfo> {
         }
 
         if key & REPORT_DESCRIPTOR_KEY_MASK == USAGE {
-            if size != 2 {
-                usage = u16::from(rd[pos + 1])
-            } else {
-                usage = LittleEndian::read_u16(&rd[(pos + 1)..(pos + 1 + (size as usize))]);
+            if usage == 0 {
+                if size != 2 {
+                    usage = u16::from(rd[pos + 1])
+                } else {
+                    usage = LittleEndian::read_u16(&rd[(pos + 1)..(pos + 1 + (size as usize))]);
+                }
             }
         }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -86,7 +86,7 @@ static BROADCAST_CID: [u8; 4] = [0xff, 0xff, 0xff, 0xff];
 pub fn get_devices() -> FidoResult<impl Iterator<Item = hid::DeviceInfo>> {
     hid::enumerate()
         .context(FidoErrorKind::Io)
-        .map(|devices| devices.filter(|dev| dev.usage_page == 0xf1d0 && dev.usage == 0x21))
+        .map(|devices| devices.filter(|dev| dev.usage_page == 0xf1d0 && dev.usage == 0x01))
         .map_err(From::from)
 }