Load executable pages into anonymous memory

The idea is that this prevents side-channel attacks on the image analysis algorithm as it prevents other executables on the same system that have libfprint loaded to cache-evict the pages. Unfortunately, this kind of work around requires extra privileges for the process. As such, it might not be a desirable solution.
2021-08-10 13:32:14 +02:00
36 changed files with 358 additions and 1369 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,6 +1,6 @@
 include:
  - local: '.gitlab-ci/libfprint-templates.yaml'
-  - project: 'freedesktop/ci-templates'
+  - project: 'wayland/ci-templates'
    ref: master
    file: '/templates/fedora.yml'
  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
@ -9,7 +9,6 @@ variables:
  extends: .libfprint_common_variables
  FDO_DISTRIBUTION_TAG: latest
  FDO_DISTRIBUTION_VERSION: rawhide
-  FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
  BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
  LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
@ -20,7 +19,7 @@ stages:
  - test
  - flatpak

-image: $FEDORA_IMAGE
+image: "$FEDORA_IMAGE"

 .build_one_driver_template: &build_one_driver
  script:
@ -160,7 +159,6 @@ container_fedora_build:
      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
  variables:
    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    FDO_FORCE_REBUILD: 1
    # a list of packages to install
    FDO_DISTRIBUTION_PACKAGES:
      $LIBFPRINT_DEPENDENCIES
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@ -26,4 +26,3 @@
    uncrustify
    valgrind
    clang-analyzer
-    diffutils
--- a/12
+++ b/12
@ -1,18 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.

-2021-06-30: v1.94.0 release
-
-Highlights:
- * Implement suspend/resume handling including USB wakeup configuration.
-   This requires writing the "persist" and "wakeup" sysfs attributes.
- * Add simple temperature module to prevent devices from becoming too hot
- * Add feature for continuous scanning
- * New internal "critical section" API to simplify driver development
- * elan: new PID 0x0c58
- * elanmoc: Fixes for multi-user handling and FW changes
- * virtual-device: Do not time out for SCAN command
-
 2021-06-30: v1.92.1 release

 Highlights:
--- a/data/autosuspend.hwdb
+++ b/data/autosuspend.hwdb
@ -4,7 +4,6 @@
 # Supported by libfprint driver aes1610
 usb:v08FFp1600*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes1660
 usb:v08FFp1660*
@ -25,19 +24,16 @@ usb:v08FFp168D*
 usb:v08FFp168E*
 usb:v08FFp168F*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2501
 usb:v08FFp2500*
 usb:v08FFp2580*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2550
 usb:v08FFp2550*
 usb:v08FFp2810*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes2660
 usb:v08FFp2660*
@ -59,23 +55,19 @@ usb:v08FFp268E*
 usb:v08FFp268F*
 usb:v08FFp2691*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes3500
 usb:v08FFp5731*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver aes4000
 usb:v5501p08FF*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver egis0570
 usb:v1C7Ap0570*
 usb:v1C7Ap0571*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver elan
 usb:v04F3p0903*
@ -139,17 +131,14 @@ usb:v04F3p0C63*
 usb:v04F3p0C6E*
 usb:v04F3p0C58*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver elanmoc
 usb:v04F3p0C7E*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver etes603
 usb:v1C7Ap0603*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
@ -157,7 +146,6 @@ usb:v27C6p609C*
 usb:v27C6p60A2*
 usb:v27C6p639C*
 usb:v27C6p63AC*
-usb:v27C6p63BC*
 usb:v27C6p6496*
 usb:v27C6p6584*
 usb:v27C6p658C*
@ -166,12 +154,10 @@ usb:v27C6p6594*
 usb:v27C6p659C*
 usb:v27C6p6A94*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver nb1010
 usb:v298Dp1010*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver synaptics
 usb:v06CBp00BD*
@ -183,29 +169,22 @@ usb:v06CBp00C9*
 usb:v06CBp0100*
 usb:v06CBp00F0*
 usb:v06CBp0103*
-usb:v06CBp0123*
-usb:v06CBp0126*
-usb:v06CBp0129*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upeksonly
 usb:v147Ep2016*
 usb:v147Ep1000*
 usb:v147Ep1001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upektc
 usb:v0483p2015*
 usb:v147Ep3001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver upektc_img
 usb:v147Ep2020*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver uru4000
 usb:v045Ep00BC*
@ -215,28 +194,23 @@ usb:v05BAp0007*
 usb:v05BAp0008*
 usb:v05BAp000A*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vcom5s
 usb:v061Ap0110*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs0050
 usb:v138Ap0050*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs101
 usb:v138Ap0001*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs301
 usb:v138Ap0005*
 usb:v138Ap0008*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs5011
 usb:v138Ap0010*
@ -245,12 +219,10 @@ usb:v138Ap0015*
 usb:v138Ap0017*
 usb:v138Ap0018*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Supported by libfprint driver vfs7552
 usb:v138Ap0091*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0

 # Known unsupported devices
 usb:v04F3p036B*
@ -273,7 +245,6 @@ usb:v06CBp00C4*
 usb:v06CBp00CB*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
-usb:v06CBp00E7*
 usb:v06CBp00E9*
 usb:v0A5Cp5801*
 usb:v0A5Cp5805*
@ -282,7 +253,6 @@ usb:v0A5Cp5840*
 usb:v0A5Cp5841*
 usb:v0A5Cp5842*
 usb:v0A5Cp5843*
-usb:v0A5Cp5844*
 usb:v0A5Cp5845*
 usb:v10A5p0007*
 usb:v1188p9545*
@ -325,4 +295,3 @@ usb:v2808p9338*
 usb:v298Dp2033*
 usb:v3538p0930*
 ID_AUTOSUSPEND=1
- ID_PERSIST=0
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@ -50,8 +50,6 @@ fp_device_capture
 fp_device_delete_print
 fp_device_list_prints
 fp_device_clear_storage
-fp_device_suspend
-fp_device_resume
 fp_device_open_finish
 fp_device_close_finish
 fp_device_enroll_finish
@ -61,8 +59,6 @@ fp_device_capture_finish
 fp_device_delete_print_finish
 fp_device_list_prints_finish
 fp_device_clear_storage_finish
-fp_device_suspend_finish
-fp_device_resume_finish
 fp_device_open_sync
 fp_device_close_sync
 fp_device_enroll_sync
@ -72,8 +68,6 @@ fp_device_capture_sync
 fp_device_delete_print_sync
 fp_device_list_prints_sync
 fp_device_clear_storage_sync
-fp_device_suspend_sync
-fp_device_resume_sync
 FpDevice
 </SECTION>

@ -166,8 +160,6 @@ fpi_device_add_timeout
 fpi_device_set_nr_enroll_stages
 fpi_device_set_scan_type
 fpi_device_update_features
-fpi_device_critical_enter
-fpi_device_critical_leave
 fpi_device_remove
 fpi_device_report_finger_status
 fpi_device_report_finger_status_changes
@ -180,12 +172,10 @@ fpi_device_verify_complete
 fpi_device_identify_complete
 fpi_device_capture_complete
 fpi_device_delete_complete
-fpi_device_list_complete
-fpi_device_suspend_complete
-fpi_device_resume_complete
 fpi_device_enroll_progress
 fpi_device_verify_report
 fpi_device_identify_report
+fpi_device_list_complete
 fpi_device_class_auto_initialize_features
 </SECTION>

--- a/libfprint/drivers/elanmoc/elanmoc.c
+++ b/libfprint/drivers/elanmoc/elanmoc.c
@ -331,8 +331,7 @@ elanmoc_reenroll_cb (FpiDeviceElanmoc *self,
      if ((self->curr_enrolled == (ELAN_MAX_ENROLL_NUM + 1)) && (buffer_in[1] == 0x00))
        {
          fp_warn ("elanmoc_reenroll_cb over enroll max");
-          fpi_ssm_mark_failed (self->task_ssm,
-                               fpi_device_error_new (FP_DEVICE_ERROR_DATA_FULL));
+          fpi_ssm_mark_completed (self->task_ssm);
          return;
        }
      if (buffer_in[1] == 0x00)
@ -432,7 +431,7 @@ elan_enroll_run_state (FpiSsm *ssm, FpDevice *dev)
    case MOC_ENROLL_REENROLL_CHECK:
      data = fpi_ssm_get_data (ssm);
      cmd_buf = elanmoc_compose_cmd (&elanmoc_check_reenroll_cmd);
-      memcpy (cmd_buf + 3, data, ELAN_USERDATE_SIZE);
+      cmd_buf[4] = data[16];
      elanmoc_get_cmd (dev, cmd_buf, elanmoc_check_reenroll_cmd.cmd_len, elanmoc_check_reenroll_cmd.resp_len, 0, elanmoc_reenroll_cb);
      break;

@ -689,10 +688,7 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,

  if (error)
    {
-      if (fpi_device_get_current_action (device) == FPI_DEVICE_ACTION_VERIFY)
-        fpi_device_verify_complete (device, error);
-      else
-        fpi_device_identify_complete (device, error);
+      fpi_device_enroll_complete (device, NULL, error);
      return;
    }

@ -806,7 +802,7 @@ elanmoc_enroll (FpDevice *device)
  FpPrint *print = NULL;
  GVariant *data = NULL;
  GVariant *uid = NULL;
-  g_autofree gchar *user_id = NULL;
+  g_autofree gchar *user_id;
  gsize user_id_len;
  guint8 *userdata = g_malloc0 (ELAN_USERDATE_SIZE);

--- a/libfprint/drivers/elanmoc/elanmoc.h
+++ b/libfprint/drivers/elanmoc/elanmoc.h
@ -34,7 +34,7 @@ G_DECLARE_FINAL_TYPE (FpiDeviceElanmoc, fpi_device_elanmoc, FPI, DEVICE_ELANMOC,
 #define ELAN_EP_MOC_CMD_IN (0x4 | LIBUSB_ENDPOINT_IN)
 #define ELAN_EP_IMG_IN (0x2 | LIBUSB_ENDPOINT_IN)

-#define ELAN_MOC_CMD_TIMEOUT 5000
+#define ELAN_MOC_CMD_TIMEOUT 2000
 #define ELAN_MOC_CAL_RETRY 500
 #define ELAN_MOC_ENROLL_TIMES 9
 #define ELAN_MAX_USER_ID_LEN 92
@ -135,7 +135,7 @@ static const struct elanmoc_cmd elanmoc_set_mod_cmd = {

 static const struct elanmoc_cmd elanmoc_check_reenroll_cmd = {
  .cmd_header = {0x40, 0xff, 0x22},
-  .cmd_len = 3 + ELAN_USERDATE_SIZE,
+  .cmd_len = 5,
  .resp_len = 2,
 };

--- a/libfprint/drivers/goodixmoc/goodix.c
+++ b/libfprint/drivers/goodixmoc/goodix.c
@ -1320,7 +1320,6 @@ gx_fp_probe (FpDevice *device)
    case 0x609C:
    case 0x639C:
    case 0x63AC:
-    case 0x63BC:
    case 0x6A94:
      self->max_enroll_stage = 12;
      break;
@ -1544,7 +1543,6 @@ static const FpIdEntry id_table[] = {
  { .vid = 0x27c6,  .pid = 0x60A2,  },
  { .vid = 0x27c6,  .pid = 0x639C,  },
  { .vid = 0x27c6,  .pid = 0x63AC,  },
-  { .vid = 0x27c6,  .pid = 0x63BC,  },
  { .vid = 0x27c6,  .pid = 0x6496,  },
  { .vid = 0x27c6,  .pid = 0x6584,  },
  { .vid = 0x27c6,  .pid = 0x658C,  },
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@ -40,9 +40,6 @@ static const FpIdEntry id_table[] = {
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0100,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x00F0,  },
  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0103,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0123,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0129,  },
  { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };

@ -1351,12 +1348,8 @@ fps_deinit_cb (FpiDeviceSynaptics *self,
               bmkt_response_t    *resp,
               GError             *error)
 {
-  g_autoptr(GError) err = NULL;
-
  /* Release usb interface */
-  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (self)), 0, 0, &err);
-  if (!error)
-    error = g_steal_pointer (&err);
+  g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (self)), 0, 0, &error);

  g_clear_object (&self->interrupt_cancellable);

--- a/libfprint/drivers/uru4000.c
+++ b/libfprint/drivers/uru4000.c
@ -360,9 +360,9 @@ start_irq_handler (FpImageDevice *dev)
  transfer = fpi_usb_transfer_new (FP_DEVICE (dev));
  transfer->ssm = NULL;
  transfer->short_is_error = TRUE;
-  fpi_usb_transfer_fill_interrupt (transfer,
-                                   EP_INTR,
-                                   IRQ_LENGTH);
+  fpi_usb_transfer_fill_bulk (transfer,
+                              EP_INTR,
+                              IRQ_LENGTH);
  fpi_usb_transfer_submit (transfer, 0, self->irq_cancellable, irq_handler, NULL);
 }

--- a/libfprint/drivers/virtual-device-storage.c
+++ b/libfprint/drivers/virtual-device-storage.c
@ -67,17 +67,12 @@ dev_identify (FpDevice *dev)
                                             new_scan,
                                             (GEqualFunc) fp_print_equal,
                                             NULL))
-        {
-          match = FALSE;
-          g_clear_object (&new_scan);
-        }
+        error = fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND);
      else if (g_ptr_array_find_with_equal_func (prints,
                                                 new_scan,
                                                 (GEqualFunc) fp_print_equal,
                                                 &idx))
-        {
-          match = g_ptr_array_index (prints, idx);
-        }
+        match = g_ptr_array_index (prints, idx);

      if (!self->match_reported)
        {
--- a/libfprint/drivers/virtual-device.c
+++ b/libfprint/drivers/virtual-device.c
@ -543,7 +543,7 @@ dev_verify (FpDevice *dev)

      if (self->prints_storage && !g_hash_table_contains (self->prints_storage, scan_id))
        {
-          g_clear_object (&new_scan);
+          error = fpi_device_error_new (FP_DEVICE_ERROR_DATA_NOT_FOUND);
          success = FALSE;
        }
      else
--- a/libfprint/fp-context.c
+++ b/libfprint/fp-context.c
@ -27,6 +27,9 @@

 #include <config.h>

+#include <fcntl.h>
+#include <sys/mman.h>
+
 #ifdef HAVE_UDEV
 #include <gudev/gudev.h>
 #endif
@ -354,6 +357,85 @@ fp_context_class_init (FpContextClass *klass)
                                                 FP_TYPE_DEVICE);
 }

+extern char _etext;
+
+__attribute__((constructor)) static void
+libfprint_init_section (void)
+{
+  void *start, *end;
+  size_t length;
+  void *new_mapping = NULL;
+  void *exec_mapping = NULL;
+  void *res = NULL;
+  int memfd;
+
+  /* Do not do anything if the environment variable is set.
+   * NOTE: This should just be opt-in and a separate function call.
+   */
+  if (g_getenv ("LIBFPRINT_NO_REMAP"))
+    return;
+
+  /* Assumes .init section before .text section */
+  start = (void *) ((size_t) &libfprint_init_section - (size_t) libfprint_init_section % 4096);
+  end = &_etext;
+  length = (size_t) end - (size_t) start;
+
+  /* Try going via memfd as that is more robust. */
+  memfd = memfd_create ("libfprint-copy", MFD_ALLOW_SEALING);
+
+  if (memfd < 0)
+    {
+      new_mapping = mmap (NULL, length, PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+    }
+  else
+    {
+      if (ftruncate (memfd, length) < 0)
+        goto out;
+      new_mapping = mmap (NULL, length, PROT_WRITE, MAP_SHARED, memfd, 0);
+    }
+
+  if (new_mapping == MAP_FAILED)
+    goto out;
+
+  memcpy (new_mapping, start, length);
+  if (memfd < 0)
+    {
+      if (mprotect (new_mapping, length, PROT_READ | PROT_EXEC) != 0)
+        goto out;
+
+      /* the executable mapping is now the same */
+      exec_mapping = new_mapping;
+      new_mapping = NULL;
+    }
+  else
+    {
+      munmap (new_mapping, length);
+      new_mapping = NULL;
+
+      if (fcntl (memfd, F_ADD_SEALS, F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) < 0)
+        goto out;
+
+      exec_mapping = mmap (NULL, length, PROT_READ | PROT_EXEC, MAP_PRIVATE, memfd, 0);
+      if (exec_mapping == MAP_FAILED)
+        goto out;
+    }
+
+  res = mremap (exec_mapping, length, length, MREMAP_MAYMOVE | MREMAP_FIXED, start);
+  if (res != start)
+    goto out;
+  exec_mapping = NULL;
+
+  g_message ("libfprint executable code was remapped to protect against cache side-channel attacks");
+
+out:
+  if (memfd >= 0)
+    close (memfd);
+  if (new_mapping && new_mapping != MAP_FAILED)
+    munmap (new_mapping, length);
+  if (exec_mapping && exec_mapping != MAP_FAILED)
+    munmap (exec_mapping, length);
+}
+
 static void
 fp_context_init (FpContext *self)
 {
@ -574,7 +656,7 @@ fp_context_enumerate (FpContext *context)
 *
 * Get all devices. fp_context_enumerate() will be called as needed.
 *
- * Returns: (transfer none) (element-type FpDevice): a new #GPtrArray of #FpDevice's.
+ * Returns: (transfer none) (element-type FpDevice): a new #GPtrArray of #GUsbDevice's.
 */
 GPtrArray *
 fp_context_get_devices (FpContext *context)
--- a/libfprint/fp-device.c
+++ b/libfprint/fp-device.c
@ -245,7 +245,6 @@ fp_device_get_property (GObject    *object,
 {
  FpDevice *self = FP_DEVICE (object);
  FpDevicePrivate *priv = fp_device_get_instance_private (self);
-  FpDeviceClass *cls = FP_DEVICE_GET_CLASS (self);

  switch (prop_id)
    {
@ -285,24 +284,6 @@ fp_device_get_property (GObject    *object,
      g_value_set_boolean (value, priv->is_removed);
      break;

-    case PROP_FPI_USB_DEVICE:
-      g_value_set_object (value, priv->usb_device);
-      break;
-
-    case PROP_FPI_UDEV_DATA_SPIDEV:
-      if (cls->type == FP_DEVICE_TYPE_UDEV)
-        g_value_set_string (value, g_strdup (priv->udev_data.spidev_path));
-      else
-        g_value_set_string (value, NULL);
-      break;
-
-    case PROP_FPI_UDEV_DATA_HIDRAW:
-      if (cls->type == FP_DEVICE_TYPE_UDEV)
-        g_value_set_string (value, g_strdup (priv->udev_data.hidraw_path));
-      else
-        g_value_set_string (value, NULL);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
    }
@ -549,7 +530,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "USB Device",
                         "Private: The USB device for the device",
                         G_USB_TYPE_DEVICE,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
  /**
   * FpDevice::fpi-udev-data-spidev: (skip)
   *
@ -562,7 +543,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "Udev data: spidev path",
                         "Private: The path to /dev/spidevN.M",
                         NULL,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
  /**
   * FpDevice::fpi-udev-data-hidraw: (skip)
   *
@ -575,7 +556,7 @@ fp_device_class_init (FpDeviceClass *klass)
                         "Udev data: hidraw path",
                         "Private: The path to /dev/hidrawN",
                         NULL,
-                         G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);

  /**
   * FpDevice::fpi-driver-data: (skip)
--- a/libfprint/fpi-device.h
+++ b/libfprint/fpi-device.h
@ -24,6 +24,8 @@
 #include "fp-image.h"
 #include "fpi-print.h"

+#include <config.h>
+
 /**
 * FpiDeviceUdevSubtype:
 * @FPI_DEVICE_UDEV_SUBTYPE_SPIDEV: The device requires an spidev node
--- a/libfprint/fprint-list-udev-hwdb.c
+++ b/libfprint/fprint-list-udev-hwdb.c
@ -49,7 +49,6 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x06cb, .pid = 0x00cb },
  { .vid = 0x06cb, .pid = 0x00d8 },
  { .vid = 0x06cb, .pid = 0x00da },
-  { .vid = 0x06cb, .pid = 0x00e7 },
  { .vid = 0x06cb, .pid = 0x00e9 },
  { .vid = 0x0a5c, .pid = 0x5801 },
  { .vid = 0x0a5c, .pid = 0x5805 },
@ -58,7 +57,6 @@ static const FpIdEntry whitelist_id_table[] = {
  { .vid = 0x0a5c, .pid = 0x5841 },
  { .vid = 0x0a5c, .pid = 0x5842 },
  { .vid = 0x0a5c, .pid = 0x5843 },
-  { .vid = 0x0a5c, .pid = 0x5844 },
  { .vid = 0x0a5c, .pid = 0x5845 },
  { .vid = 0x10a5, .pid = 0x0007 },
  { .vid = 0x1188, .pid = 0x9545 },
@ -167,10 +165,7 @@ print_driver (const FpDeviceClass *cls)
    }

  if (num_printed > 0)
-    {
-      g_print (" ID_AUTOSUSPEND=1\n");
-      g_print (" ID_PERSIST=0\n");
-    }
+    g_print (" ID_AUTOSUSPEND=1\n");
 }

 static int
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.0',
+    version: '1.92.1',
    license: 'LGPLv2.1+',
    default_options: [
        'buildtype=debugoptimized',
--- a/tests/README.md
+++ b/tests/README.md
@ -15,23 +15,57 @@ script, capture it and store the capture to `custom.pcapng`.
 -----------------------
 A new 'capture' test is created by means of `capture.py` script:

-1. Make sure that libfprint is built with support for the device driver
-   that you want to capture a test case for.
+1. Create (if needed) a directory for the driver under `tests`
+   directory:

-2. From the build directory, run tests/create-driver-test.py as root. Note
-   that if you're capturing data for a driver which already has a test case
-   but the hardware is slightly different, you might want to pass a variant
-   name as a command-line options, for example:
-```sh
-$ sudo tests/create-driver-test.py driver [variant]
-```
+   `mkdir DRIVER`

-3. If the capture is not successful, run the tool again to start another capture.
+   Note that the name must be the exact name of the libfprint driver,
+   or the exact name of the driver followed by a `-` and a unique identifier
+   of your choosing.

-4. Add driver test name to `drivers_tests` in the `meson.build`, as instructed,
-   and change the ownership of the just-created test directory in the source.
+2. Prepare your execution environment.

-5. Check whether `meson test` passes with this new test.
+   In the next step a working and up to date libfprint is needed. This can be
+   achieved by installing it into your system. Alternatively, you can set
+   the following environment variables to run a local build:
+   - `export LD_PRELOAD=<meson-build-dir>/libfprint/libfprint-2.so`
+   - `export GI_TYPELIB_PATH=<meson-build-dir>/libfprint`
+
+   Also, sometimes the driver must be adapted to the emulated environment
+   (mainly if it uses random numbers, see `synaptics.c` for an example).
+   Set the following environment variable to enable this adaptation:
+   - `export FP_DEVICE_EMULATION=1`
+
+   Run the next steps in the same terminal.
+
+3. Find the real USB fingerprint device with `lsusb`, e.g.:
+
+   `Bus 001 Device 005: ID 138a:0090 Validity Sensors, Inc. VFS7500 Touch Fingerprint Sensor`
+
+   The following USB device is used in the example above:
+   `/dev/bus/usb/001/005`.
+
+   For the following commands, it is assumed that the user that's
+   running the commands has full access to the device node, whether
+   by running the commands as `root`, or changing the permissions for
+   that device node.
+
+4. Record information about this device:
+
+   `umockdev-record /dev/bus/usb/001/005 > DRIVER/device`
+
+5. Record interaction of `capture.py` (or other test) with the device. To do
+   so, start wireshark and record `usbmonX` (where X is the bus number). Then
+   run the test script:
+
+   `python3 ./capture.py DRIVER/capture.png`
+
+   Save the wireshark recording as `capture.pcapng`. The command will create
+   `capture.png`.
+
+6. Add driver's name to `drivers_tests` in the `meson.build`.
+7. Check whether everything works as expected.

 **Note.** To avoid submitting a real fingerprint, the side of finger,
 arm, or anything else producing an image with the device can be used.
--- a/tests/aes2501/capture.pcapng
+++ b/tests/aes2501/capture.pcapng
--- a/tests/aes2501/capture.png
+++ b/tests/aes2501/capture.png
--- a/tests/aes2501/device
+++ b/tests/aes2501/device
@ -1,223 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/044=12011001FFFFFF08FF08802523060001000109022000010100A0320904000002FFFFFF000705810220000007050202080000
-E: DEVNAME=/dev/bus/usb/001/044
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=8ff/2580/623
-E: TYPE=255/255/255
-E: BUSNUM=001
-E: DEVNUM=044
-E: MAJOR=189
-E: MINOR=43
-E: SUBSYSTEM=usb
-E: ID_VENDOR=08ff
-E: ID_VENDOR_ENC=08ff
-E: ID_VENDOR_ID=08ff
-E: ID_MODEL=Fingerprint_Sensor
-E: ID_MODEL_ENC=Fingerprint\x20Sensor
-E: ID_MODEL_ID=2580
-E: ID_REVISION=0623
-E: ID_SERIAL=08ff_Fingerprint_Sensor
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=AuthenTec, Inc.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=AES2501 Fingerprint Sensor
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=AuthenTec AES2501
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=ff\n
-A: bDeviceProtocol=ff\n
-A: bDeviceSubClass=ff\n
-A: bMaxPacketSize0=8\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0623\n
-A: bmAttributes=a0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12011001FFFFFF08FF08802523060001000109022000010100A0320904000002FFFFFF000705810220000007050202080000
-A: dev=189:43\n
-A: devnum=44\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=2580\n
-A: idVendor=08ff\n
-A: ltm_capable=no\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=10573\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=23441\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=10430\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=12771\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=Fingerprint Sensor\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=13241\n
-A: version= 1.10\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=767293591\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=767293591\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=767293588\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1086\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000560BBD0700000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   46   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=767293736\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=59\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=59\n
-A: power/wakeup_last_time_ms=763021754\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6149\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/create-driver-test.py.in
+++ b/tests/create-driver-test.py.in
@ -1,162 +0,0 @@
-#!/usr/bin/python3
-
-BUILDDIR='@BUILDDIR@'
-SRCDIR='@SRCDIR@'
-
-import os
-import sys
-import signal
-library_path = BUILDDIR + '/libfprint/'
-
-# Relaunch ourselves with a changed environment so
-# that we're loading the development version of libfprint
-if 'LD_LIBRARY_PATH' not in os.environ or not library_path in os.environ['LD_LIBRARY_PATH']:
-    os.environ['LD_LIBRARY_PATH'] = library_path
-    os.environ['GI_TYPELIB_PATH'] = f'{BUILDDIR}/libfprint/'
-    os.environ['FP_DEVICE_EMULATION'] = '1'
-    try:
-        os.execv(sys.argv[0], sys.argv)
-    except Exception as e:
-        print('Could not run script with new library path')
-        sys.exit(1)
-
-import gi
-gi.require_version('FPrint', '2.0')
-from gi.repository import FPrint
-
-gi.require_version('GUsb', '1.0')
-from gi.repository import GUsb
-
-import re
-import shutil
-import subprocess
-import tempfile
-import time
-
-def print_usage():
-    print(f'Usage: {sys.argv[0]} driver [test-variant-name]')
-    print('A test variant name is optional, and must be all lower case letters, or dashes, with no spaces')
-    print(f'The captured data will be stored in {SRCDIR}/tests/[driver name]-[test variant name]')
-
-if len(sys.argv) > 3:
-    print_usage()
-    sys.exit(1)
-
-driver_name = sys.argv[1]
-os.environ['FP_DRIVERS_WHITELIST'] = driver_name
-
-test_variant = None
-if len(sys.argv) == 3:
-    valid_re = re.compile('[a-z-]*')
-    test_variant = sys.argv[2]
-    if (not valid_re.match(test_variant) or
-        test_variant.startswith('-') or
-        test_variant.endswith('-')):
-        print(f'Invalid variant name {test_variant}\n')
-        print_usage()
-        sys.exit(1)
-
-# Check that running as root
-
-if os.geteuid() != 0:
-    print(f'{sys.argv[0]} is expected to be run as root')
-    sys.exit(1)
-
-# Check that tshark is available
-
-tshark = shutil.which('tshark')
-if not tshark:
-    print("The 'tshark' WireShark command-line tool must be installed to capture USB traffic")
-    sys.exit(1)
-
-# Find the fingerprint reader
-ctx = FPrint.Context()
-ctx.enumerate()
-devices = ctx.get_devices()
-if len(devices) == 0:
-    print('Could not find a supported fingerprint reader')
-    sys.exit(1)
-elif len(devices) > 1:
-    print('Capture requires a single supported fingerprint reader to be plugged in')
-    sys.exit(1)
-
-test_name = driver_name
-if test_variant:
-    test_name = driver_name + '-' + test_variant
-usb_device = devices[0].get_property('fpi-usb-device')
-bus_num = usb_device.get_bus()
-device_num = usb_device.get_address()
-
-print(f'### Detected USB device /dev/bus/usb/{bus_num:03d}/{device_num:03d}')
-
-# Make directory
-
-test_dir = SRCDIR + '/tests/' + test_name
-os.makedirs(test_dir, mode=0o775, exist_ok=True)
-
-# Capture device info
-
-args = ['umockdev-record', f'/dev/bus/usb/{bus_num:03d}/{device_num:03d}']
-device_out = open(test_dir + '/device', 'w')
-process = subprocess.Popen(args, stdout=device_out)
-process.wait()
-
-# Run capture
-# https://osqa-ask.wireshark.org/questions/53919/how-can-i-precisely-specify-a-usb-device-to-capture-with-tshark/
-
-print(f'### Starting USB capture on usbmon{bus_num}')
-capture_pid = os.fork()
-assert(capture_pid >= 0)
-
-unfiltered_cap_path = os.path.join(tempfile.gettempdir(), 'capture-unfiltered.pcapng')
-if capture_pid == 0:
-    os.setpgrp()
-    args = ['tshark', '-q', '-i', f'usbmon{bus_num}', '-w', unfiltered_cap_path]
-    os.execv(tshark, args)
-
-# Wait 1 sec to settle (we can assume setpgrp happened)
-time.sleep(1)
-
-print('### Capturing fingerprint, please swipe or press your finger on the reader')
-with subprocess.Popen(['python3', SRCDIR + '/tests/capture.py', test_dir + '/capture.png']) as capture_process:
-    capture_process.wait()
-    if capture_process.returncode != 0:
-        print('Failed to capture fingerprint')
-        os.killpg(capture_pid, signal.SIGKILL)
-        sys.exit(1)
-
-def t_waitpid(pid, timeout):
-    timeout = time.time() + timeout
-    r = os.waitpid(pid, os.WNOHANG)
-    while timeout > time.time() and r[0] == 0:
-        time.sleep(0.1)
-        r = os.waitpid(pid, os.WNOHANG)
-
-    return r
-
-os.kill(capture_pid, signal.SIGTERM)
-try:
-    r = t_waitpid(capture_pid, 2)
-    # Kill if nothing died
-    if r[0] == 0:
-        os.kill(capture_pid, signal.SIGKILL)
-except ChildProcessError:
-    pass
-
-try:
-    while True:
-        r = t_waitpid(-capture_pid, timeout=2)
-        # Kill the process group, if nothing died (and there are children)
-        if r[0] == 0:
-            os.killpg(capture_pid, signal.SIGKILL)
-except ChildProcessError:
-    pass
-
-# Filter the capture
-print(f'\n### Saving USB capture as test case {test_name}')
-args = ['tshark', '-r', unfiltered_cap_path, '-Y', f'usb.bus_id == {bus_num} and usb.device_address == {device_num}',
-        '-w', test_dir + '/capture.pcapng']
-with subprocess.Popen(args, stderr=subprocess.DEVNULL) as filter_process:
-    filter_process.wait()
-
-print(f"\nDone! Don't forget to add {test_name} to tests/meson.build")
--- a/tests/elan-cobo/capture.pcapng
+++ b/tests/elan-cobo/capture.pcapng
--- a/tests/elan-cobo/capture.png
+++ b/tests/elan-cobo/capture.png
--- a/tests/elan-cobo/device
+++ b/tests/elan-cobo/device
@ -1,217 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/045=1201000200000008F304260C40010102000109023E0001010080320904000005FF0000000921100100012215000705810240000107050102400001070582024000010705830240000107050302400001
-E: DEVNAME=/dev/bus/usb/001/045
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=4f3/c26/140
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=045
-E: MAJOR=189
-E: MINOR=44
-E: SUBSYSTEM=usb
-E: ID_VENDOR=ELAN
-E: ID_VENDOR_ENC=ELAN
-E: ID_VENDOR_ID=04f3
-E: ID_MODEL=ELAN:Fingerprint
-E: ID_MODEL_ENC=ELAN:Fingerprint
-E: ID_MODEL_ID=0c26
-E: ID_REVISION=0140
-E: ID_SERIAL=ELAN_ELAN:Fingerprint
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ff0000:
-E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_AUTOSUSPEND=1
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=ElanTech Fingerprint Sensor
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_10
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=00\n
-A: bDeviceProtocol=00\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=8\n
-A: bMaxPower=100mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0140\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=1201000200000008F304260C40010102000109023E0001010080320904000005FF0000000921100100012215000705810240000107050102400001070582024000010705830240000107050302400001
-A: dev=189:44\n
-A: devnum=45\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=0c26\n
-A: idVendor=04f3\n
-A: ltm_capable=no\n
-A: manufacturer=ELAN\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=21526\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=96442\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=21572\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=74628\n
-A: product=ELAN:Fingerprint\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=103\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=767973436\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=767973436\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=767973433\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1174\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000420DD90700000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   52   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=767973582\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=59\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=59\n
-A: power/wakeup_last_time_ms=763021754\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6149\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/elanmoc/custom.pcapng
+++ b/tests/elanmoc/custom.pcapng
--- a/tests/elanmoc/device
+++ b/tests/elanmoc/device
@ -1,14 +1,14 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/010
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-3
+N: bus/usb/001/017=1201000200000040F3047E0C06030102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+E: DEVNAME=/dev/bus/usb/001/017
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=4f3/c7e/305
+E: PRODUCT=4f3/c7e/306
 E: TYPE=0/0/0
 E: BUSNUM=001
-E: DEVNUM=010
+E: DEVNUM=017
 E: MAJOR=189
-E: MINOR=9
+E: MINOR=16
 E: SUBSYSTEM=usb
 E: ID_VENDOR=ELAN
 E: ID_VENDOR_ENC=ELAN
@ -16,210 +16,208 @@ E: ID_VENDOR_ID=04f3
 E: ID_MODEL=ELAN:ARM-M4
 E: ID_MODEL_ENC=ELAN:ARM-M4
 E: ID_MODEL_ID=0c7e
-E: ID_REVISION=0305
+E: ID_REVISION=0306
 E: ID_SERIAL=ELAN_ELAN:ARM-M4
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Elan Microelectronics Corp.
-E: ID_PATH=pci-0000:00:14.0-usb-0:1
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1
-A: authorized=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=00
-A: bDeviceProtocol=00
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=64
-A: bMaxPower=100mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=0305
-A: bmAttributes=a0
-A: busnum=1
-A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9
-H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:9
-A: devnum=10
-A: devpath=1
+E: ID_PATH=pci-0000:00:14.0-usb-0:3
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_3
+E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_3
+E: TAGS=:seat:
+E: CURRENT_TAGS=:seat:
+A: authorized=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=00\n
+A: bDeviceProtocol=00\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=64\n
+A: bMaxPower=100mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0306\n
+A: bmAttributes=a0\n
+A: busnum=1\n
+A: configuration=
+H: descriptors=1201000200000040F3047E0C06030102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+A: dev=189:16\n
+A: devnum=17\n
+A: devpath=3\n
 L: driver=../../../../../bus/usb/drivers/usb
-A: idProduct=0c7e
-A: idVendor=04f3
-A: ltm_capable=no
-A: manufacturer=ELAN
-A: maxchild=0
-L: port=../1-0:1.0/usb1-port1
-A: power/active_duration=94712
-A: power/async=enabled
-A: power/autosuspend=2
-A: power/autosuspend_delay_ms=2000
-A: power/connected_duration=94712
-A: power/control=on
-A: power/level=on
-A: power/persist=1
-A: power/runtime_active_kids=0
-A: power/runtime_active_time=94436
-A: power/runtime_enabled=forbidden
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=1
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=ELAN:ARM-M4
-A: quirks=0x0
-A: removable=removable
-A: rx_lanes=1
-A: speed=12
-A: tx_lanes=1
-A: urbnum=12
-A: version= 2.00
+L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20
+A: idProduct=0c7e\n
+A: idVendor=04f3\n
+A: ltm_capable=no\n
+A: manufacturer=ELAN\n
+A: maxchild=0\n
+L: port=../1-0:1.0/usb1-port3
+A: power/active_duration=2748\n
+A: power/autosuspend=2\n
+A: power/autosuspend_delay_ms=2000\n
+A: power/connected_duration=18266\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/persist=1\n
+A: power/runtime_active_time=2603\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=15422\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=ELAN:ARM-M4\n
+A: quirks=0x0\n
+A: removable=removable\n
+A: rx_lanes=1\n
+A: speed=12\n
+A: tx_lanes=1\n
+A: urbnum=12\n
+A: version= 2.00\n

 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020012050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/504
+E: PRODUCT=1d6b/2/512
 E: TYPE=9/0/1
 E: BUSNUM=001
 E: DEVNUM=001
 E: MAJOR=189
 E: MINOR=0
 E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\x20xhci-hcd
+E: ID_VENDOR=Linux_5.12.12-300.fc34.x86_64_xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.12.12-300.fc34.x86_64\x20xhci-hcd
 E: ID_VENDOR_ID=1d6b
 E: ID_MODEL=xHCI_Host_Controller
 E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
 E: ID_MODEL_ID=0002
-E: ID_REVISION=0504
-E: ID_SERIAL=Linux_5.4.0-42-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_REVISION=0512
+E: ID_SERIAL=Linux_5.12.12-300.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
 E: ID_SERIAL_SHORT=0000:00:14.0
 E: ID_BUS=usb
 E: ID_USB_INTERFACES=:090000:
 E: ID_VENDOR_FROM_DATABASE=Linux Foundation
+E: ID_AUTOSUSPEND=1
 E: ID_MODEL_FROM_DATABASE=2.0 root hub
 E: ID_PATH=pci-0000:00:14.0
 E: ID_PATH_TAG=pci-0000_00_14_0
 E: ID_FOR_SEAT=usb-pci-0000_00_14_0
 E: TAGS=:seat:
-A: authorized=1
-A: authorized_default=1
-A: avoid_reset_quirk=0
-A: bConfigurationValue=1
-A: bDeviceClass=09
-A: bDeviceProtocol=01
-A: bDeviceSubClass=00
-A: bMaxPacketSize0=64
-A: bMaxPower=0mA
-A: bNumConfigurations=1
-A: bNumInterfaces= 1
-A: bcdDevice=0504
-A: bmAttributes=e0
-A: busnum=1
+E: CURRENT_TAGS=:seat:
+A: authorized=1\n
+A: authorized_default=1\n
+A: avoid_reset_quirk=0\n
+A: bConfigurationValue=1\n
+A: bDeviceClass=09\n
+A: bDeviceProtocol=01\n
+A: bDeviceSubClass=00\n
+A: bMaxPacketSize0=64\n
+A: bMaxPower=0mA\n
+A: bNumConfigurations=1\n
+A: bNumInterfaces= 1\n
+A: bcdDevice=0512\n
+A: bmAttributes=e0\n
+A: busnum=1\n
 A: configuration=
-H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0
-A: devnum=1
-A: devpath=0
+H: descriptors=12010002090001406B1D020012050302010109021900010100E0000904000001090000000705810304000C
+A: dev=189:0\n
+A: devnum=1\n
+A: devpath=0\n
 L: driver=../../../../bus/usb/drivers/usb
-A: idProduct=0002
-A: idVendor=1d6b
-A: interface_authorized_default=1
-A: ltm_capable=no
-A: manufacturer=Linux 5.4.0-42-generic xhci-hcd
-A: maxchild=12
-A: power/active_duration=74604360
-A: power/async=enabled
-A: power/autosuspend=0
-A: power/autosuspend_delay_ms=0
-A: power/connected_duration=74606456
-A: power/control=auto
-A: power/level=auto
-A: power/runtime_active_kids=4
-A: power/runtime_active_time=74605838
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=0
-A: power/wakeup=disabled
-A: power/wakeup_abort_count=
-A: power/wakeup_active=
-A: power/wakeup_active_count=
-A: power/wakeup_count=
-A: power/wakeup_expire_count=
-A: power/wakeup_last_time_ms=
-A: power/wakeup_max_time_ms=
-A: power/wakeup_total_time_ms=
-A: product=xHCI Host Controller
-A: quirks=0x0
-A: removable=unknown
-A: rx_lanes=1
-A: serial=0000:00:14.0
-A: speed=480
-A: tx_lanes=1
-A: urbnum=490
-A: version= 2.00
+L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d
+A: idProduct=0002\n
+A: idVendor=1d6b\n
+A: interface_authorized_default=1\n
+A: ltm_capable=no\n
+A: manufacturer=Linux 5.12.12-300.fc34.x86_64 xhci-hcd\n
+A: maxchild=12\n
+A: power/active_duration=187216979\n
+A: power/autosuspend=0\n
+A: power/autosuspend_delay_ms=0\n
+A: power/connected_duration=187239996\n
+A: power/control=auto\n
+A: power/level=auto\n
+A: power/runtime_active_time=187220224\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/wakeup=disabled\n
+A: power/wakeup_abort_count=\n
+A: power/wakeup_active=\n
+A: power/wakeup_active_count=\n
+A: power/wakeup_count=\n
+A: power/wakeup_expire_count=\n
+A: power/wakeup_last_time_ms=\n
+A: power/wakeup_max_time_ms=\n
+A: power/wakeup_total_time_ms=\n
+A: product=xHCI Host Controller\n
+A: quirks=0x0\n
+A: removable=unknown\n
+A: rx_lanes=1\n
+A: serial=0000:00:14.0\n
+A: speed=480\n
+A: tx_lanes=1\n
+A: urbnum=3372\n
+A: version= 2.00\n

 P: /devices/pci0000:00/0000:00:14.0
 E: DRIVER=xhci_hcd
 E: PCI_CLASS=C0330
 E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=103C:85EF
+E: PCI_SUBSYS_ID=17AA:2292
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
+E: MODALIAS=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30
 E: SUBSYSTEM=pci
 E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
 E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
 E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
 E: ID_VENDOR_FROM_DATABASE=Intel Corporation
+E: ID_AUTOSUSPEND=1
 E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
-A: ari_enabled=0
-A: broken_parity_status=0
-A: class=0x0c0330
-H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
-A: consistent_dma_mask_bits=64
-A: d3cold_allowed=1
-A: dbc=disabled
-A: device=0x9ded
-A: dma_mask_bits=64
+A: ari_enabled=0\n
+A: broken_parity_status=0\n
+A: class=0x0c0330\n
+H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000
+A: consistent_dma_mask_bits=64\n
+A: d3cold_allowed=1\n
+A: dbc=disabled\n
+A: device=0x9ded\n
+A: dma_mask_bits=64\n
 L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)
-A: enable=1
-A: irq=124
-A: local_cpulist=0-3
-A: local_cpus=f
-A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
-A: msi_bus=1
-A: msi_irqs/124=msi
-A: numa_node=-1
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0   32  128  1\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   11   12 2112 12\nxHCI ring segments   54   54 4096 54\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          9   32  128  1\nbuffer-32           0    0   32  0
-A: power/async=enabled
-A: power/control=auto
-A: power/runtime_active_kids=1
-A: power/runtime_active_time=74606194
-A: power/runtime_enabled=enabled
-A: power/runtime_status=active
-A: power/runtime_suspended_time=0
-A: power/runtime_usage=0
-A: power/wakeup=enabled
-A: power/wakeup_abort_count=0
-A: power/wakeup_active=0
-A: power/wakeup_active_count=0
-A: power/wakeup_count=0
-A: power/wakeup_expire_count=0
-A: power/wakeup_last_time_ms=0
-A: power/wakeup_max_time_ms=0
-A: power/wakeup_total_time_ms=0
-A: resource=0x00000000a1300000 0x00000000a130ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000
-A: revision=0x30
-A: subsystem_device=0x85ef
-A: subsystem_vendor=0x103c
-A: vendor=0x8086
+A: driver_override=(null)\n
+A: enable=1\n
+L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c
+A: irq=128\n
+A: local_cpulist=0-7\n
+A: local_cpus=ff\n
+A: modalias=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30\n
+A: msi_bus=1\n
+A: msi_irqs/128=msi\n
+A: numa_node=-1\n
+A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   11   12 2112 12\nxHCI ring segments   58   62 4096 62\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          6   32  128  1\nbuffer-32           0    0   32  0\n
+A: power/control=on\n
+A: power/runtime_active_time=187221117\n
+A: power/runtime_status=active\n
+A: power/runtime_suspended_time=0\n
+A: power/wakeup=enabled\n
+A: power/wakeup_abort_count=0\n
+A: power/wakeup_active=0\n
+A: power/wakeup_active_count=0\n
+A: power/wakeup_count=0\n
+A: power/wakeup_expire_count=0\n
+A: power/wakeup_last_time_ms=0\n
+A: power/wakeup_max_time_ms=0\n
+A: power/wakeup_total_time_ms=0\n
+A: power_state=D0\n
+A: resource=0x00000000ea220000 0x00000000ea22ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
+A: revision=0x11\n
+A: subsystem_device=0x2292\n
+A: subsystem_vendor=0x17aa\n
+A: vendor=0x8086\n

--- a/tests/meson.build
+++ b/tests/meson.build
@ -22,16 +22,12 @@ envs.set('FP_DRIVERS_WHITELIST', ':'.join([
 envs.set('NO_AT_BRIDGE', '1')

 drivers_tests = [
-    'aes2501',
    'aes3500',
    'elan',
-    'elan-cobo',
    'elanmoc',
    'elanspi',
    'synaptics',
    'upektc_img',
-    'uru4000-msv2',
-    'uru4000-4500',
    'vfs0050',
    'vfs301',
    'vfs5011',
@ -41,15 +37,6 @@ drivers_tests = [
    'egis0570',
 ]

-if get_option('introspection')
-  conf = configuration_data()
-  conf.set('SRCDIR', meson.source_root())
-  conf.set('BUILDDIR', meson.build_root())
-  configure_file(configuration: conf,
-      input: 'create-driver-test.py.in',
-      output: 'create-driver-test.py')
-endif
-
 if get_option('introspection')
    envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint'))
    virtual_devices_tests = [
@ -99,7 +86,11 @@ if get_option('introspection')
    endforeach

    foreach driver_test: drivers_tests
-        driver_name = driver_test.split('-')[0]
+        if driver_test.contains('-')
+          driver_name = driver_test.split('-')[0]
+        else
+          driver_name = driver_test
+        endif
        driver_envs = envs
        driver_envs.set('FP_DRIVERS_WHITELIST', driver_name)

--- a/tests/umockdev-test.py
+++ b/tests/umockdev-test.py
@ -18,7 +18,7 @@ try:
    if version < (0, 13, 2):
        print('umockdev is too old for test to be reliable, expect random failures!')
        print('Please update umockdev to at least 0.13.2.')
-    pcap_supported = version >= (0, 16, 3) or os.getenv('CI_PROJECT_NAME') == "libfprint"
+    pcap_supported = version >= (0, 16, 2) or os.getenv('CI_PROJECT_NAME') == "libfprint"
    spi_supported = version >= (0, 16) or os.getenv('CI_PROJECT_NAME') == "libfprint"

 except FileNotFoundError:
--- a/tests/uru4000-4500/capture.pcapng
+++ b/tests/uru4000-4500/capture.pcapng
--- a/tests/uru4000-4500/capture.png
+++ b/tests/uru4000-4500/capture.png
--- a/tests/uru4000-4500/device
+++ b/tests/uru4000-4500/device
@ -1,220 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/050=1201000200000040BA050A000301010203010902200001010080640904000002FFFFFF000705810340000807058202400000
-E: DEVNAME=/dev/bus/usb/001/050
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=5ba/a/103
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=050
-E: MAJOR=189
-E: MINOR=49
-E: SUBSYSTEM=usb
-E: ID_VENDOR=DigitalPersona__Inc.
-E: ID_VENDOR_ENC=DigitalPersona\x2c\x20Inc.
-E: ID_VENDOR_ID=05ba
-E: ID_MODEL=U.are.U®_4500_Fingerprint_Reader
-E: ID_MODEL_ENC=U.are.U®\x204500\x20Fingerprint\x20Reader
-E: ID_MODEL_ID=000a
-E: ID_REVISION=0103
-E: ID_SERIAL=DigitalPersona__Inc._U.are.U®_4500_Fingerprint_Reader__FB0B9071-2E08-7742-BC16-2FAA247CEF66_
-E: ID_SERIAL_SHORT=_FB0B9071-2E08-7742-BC16-2FAA247CEF66_
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=DigitalPersona, Inc.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Fingerprint Reader
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=Digital Persona U.are.U 4000/4000B/4500
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_10
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=00\n
-A: bDeviceProtocol=00\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=200mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0103\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=1201000200000040BA050A000301010203010902200001010080640904000002FFFFFF000705810340000807058202400000
-A: dev=189:49\n
-A: devnum=50\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=000a\n
-A: idVendor=05ba\n
-A: ltm_capable=no\n
-A: manufacturer=DigitalPersona, Inc.\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=2761\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=118841\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=2616\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=115982\n
-A: product=U.are.U\302\256 4500 Fingerprint Reader\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: serial={FB0B9071-2E08-7742-BC16-2FAA247CEF66}\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=13\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=837797629\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=837797629\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=837797626\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1498\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000009A1CF40100000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   46   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=837797789\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=67\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=67\n
-A: power/wakeup_last_time_ms=835747082\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6974\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/uru4000-msv2/capture.pcapng
+++ b/tests/uru4000-msv2/capture.pcapng
--- a/tests/uru4000-msv2/capture.png
+++ b/tests/uru4000-msv2/capture.png
--- a/tests/uru4000-msv2/device
+++ b/tests/uru4000-msv2/device
@ -1,220 +0,0 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-10
-N: bus/usb/001/047=12010002000000405E04CA000001010203010902200001010080820904000002FFFFFF000705810340000807058202400000
-E: DEVNAME=/dev/bus/usb/001/047
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=45e/ca/100
-E: TYPE=0/0/0
-E: BUSNUM=001
-E: DEVNUM=047
-E: MAJOR=189
-E: MINOR=46
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Microsoft
-E: ID_VENDOR_ENC=Microsoft
-E: ID_VENDOR_ID=045e
-E: ID_MODEL=Microsoft®_Fingerprint_Reader
-E: ID_MODEL_ENC=Microsoft®\x20Fingerprint\x20Reader
-E: ID_MODEL_ID=00ca
-E: ID_REVISION=0100
-E: ID_SERIAL=Microsoft_Microsoft®_Fingerprint_Reader__BE815DAD-15E4-0745-AA30-41DEBCAC5913_
-E: ID_SERIAL_SHORT=_BE815DAD-15E4-0745-AA30-41DEBCAC5913_
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:ffffff:
-E: ID_VENDOR_FROM_DATABASE=Microsoft Corp.
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=Fingerprint Reader
-E: ID_PATH=pci-0000:00:14.0-usb-0:10
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_10
-E: LIBFPRINT_DRIVER=Digital Persona U.are.U 4000/4000B/4500
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_10
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=00\n
-A: bDeviceProtocol=00\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=260mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0100\n
-A: bmAttributes=80\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002000000405E04CA000001010203010902200001010080820904000002FFFFFF000705810340000807058202400000
-A: dev=189:46\n
-A: devnum=47\n
-A: devpath=10\n
-L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d/device:57
-A: idProduct=00ca\n
-A: idVendor=045e\n
-A: ltm_capable=no\n
-A: manufacturer=Microsoft\n
-A: maxchild=0\n
-L: port=../1-0:1.0/usb1-port10
-A: power/active_duration=31642\n
-A: power/autosuspend=2\n
-A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=1177852\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/persist=0\n
-A: power/runtime_active_time=31877\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=1145731\n
-A: product=Microsoft\302\256 Fingerprint Reader\n
-A: quirks=0x0\n
-A: removable=removable\n
-A: rx_lanes=1\n
-A: serial={BE815DAD-15E4-0745-AA30-41DEBCAC5913}\n
-A: speed=12\n
-A: tx_lanes=1\n
-A: urbnum=183\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-E: DEVNAME=/dev/bus/usb/001/001
-E: DEVTYPE=usb_device
-E: DRIVER=usb
-E: PRODUCT=1d6b/2/513
-E: TYPE=9/0/1
-E: BUSNUM=001
-E: DEVNUM=001
-E: MAJOR=189
-E: MINOR=0
-E: SUBSYSTEM=usb
-E: ID_VENDOR=Linux_5.13.12-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.13.12-200.fc34.x86_64\x20xhci-hcd
-E: ID_VENDOR_ID=1d6b
-E: ID_MODEL=xHCI_Host_Controller
-E: ID_MODEL_ENC=xHCI\x20Host\x20Controller
-E: ID_MODEL_ID=0002
-E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.13.12-200.fc34.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
-E: ID_SERIAL_SHORT=0000:00:14.0
-E: ID_BUS=usb
-E: ID_USB_INTERFACES=:090000:
-E: ID_VENDOR_FROM_DATABASE=Linux Foundation
-E: ID_AUTOSUSPEND=1
-E: ID_MODEL_FROM_DATABASE=2.0 root hub
-E: ID_PATH=pci-0000:00:14.0
-E: ID_PATH_TAG=pci-0000_00_14_0
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0
-E: TAGS=:seat:
-E: CURRENT_TAGS=:seat:
-A: authorized=1\n
-A: authorized_default=1\n
-A: avoid_reset_quirk=0\n
-A: bConfigurationValue=1\n
-A: bDeviceClass=09\n
-A: bDeviceProtocol=01\n
-A: bDeviceSubClass=00\n
-A: bMaxPacketSize0=64\n
-A: bMaxPower=0mA\n
-A: bNumConfigurations=1\n
-A: bNumInterfaces= 1\n
-A: bcdDevice=0513\n
-A: bmAttributes=e0\n
-A: busnum=1\n
-A: configuration=
-H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
-A: dev=189:0\n
-A: devnum=1\n
-A: devpath=0\n
-L: driver=../../../../bus/usb/drivers/usb
-L: firmware_node=../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c/device:4d
-A: idProduct=0002\n
-A: idVendor=1d6b\n
-A: interface_authorized_default=1\n
-A: ltm_capable=no\n
-A: manufacturer=Linux 5.13.12-200.fc34.x86_64 xhci-hcd\n
-A: maxchild=16\n
-A: power/active_duration=775798957\n
-A: power/autosuspend=0\n
-A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=775798957\n
-A: power/control=auto\n
-A: power/level=auto\n
-A: power/runtime_active_time=775798954\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=disabled\n
-A: power/wakeup_abort_count=\n
-A: power/wakeup_active=\n
-A: power/wakeup_active_count=\n
-A: power/wakeup_count=\n
-A: power/wakeup_expire_count=\n
-A: power/wakeup_last_time_ms=\n
-A: power/wakeup_max_time_ms=\n
-A: power/wakeup_total_time_ms=\n
-A: product=xHCI Host Controller\n
-A: quirks=0x0\n
-A: removable=unknown\n
-A: rx_lanes=1\n
-A: serial=0000:00:14.0\n
-A: speed=480\n
-A: tx_lanes=1\n
-A: urbnum=1381\n
-A: version= 2.00\n
-
-P: /devices/pci0000:00/0000:00:14.0
-E: DRIVER=xhci_hcd
-E: PCI_CLASS=C0330
-E: PCI_ID=8086:A36D
-E: PCI_SUBSYS_ID=17AA:312A
-E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30
-E: SUBSYSTEM=pci
-E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
-E: ID_PCI_SUBCLASS_FROM_DATABASE=USB controller
-E: ID_PCI_INTERFACE_FROM_DATABASE=XHCI
-E: ID_VENDOR_FROM_DATABASE=Intel Corporation
-E: ID_MODEL_FROM_DATABASE=Cannon Lake PCH USB 3.1 xHCI Host Controller
-A: ari_enabled=0\n
-A: broken_parity_status=0\n
-A: class=0x0c0330\n
-H: config=86806DA3060490021030030C00008000040032B1000000000000000000000000000000000000000000000000AA172A31000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000970B083900000000316000000000000000000000000000000180C2C1080000000000000000000000059087009802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F400200000100006000000008020000010000000400000090000000001800000005000000000000000300000C0000004000000080000000030000000000000000000000000000000000000000000000B50F110112000000
-A: consistent_dma_mask_bits=64\n
-A: d3cold_allowed=1\n
-A: dbc=disabled\n
-A: device=0xa36d\n
-A: dma_mask_bits=64\n
-L: driver=../../../bus/pci/drivers/xhci_hcd
-A: driver_override=(null)\n
-A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:4c
-A: index=3\n
-A: irq=125\n
-A: label=Onboard - Other\n
-A: local_cpulist=0-5\n
-A: local_cpus=3f\n
-A: modalias=pci:v00008086d0000A36Dsv000017AAsd0000312Abc0Csc03i30\n
-A: msi_bus=1\n
-A: msi_irqs/125=msi\n
-A: numa_node=-1\n
-A: pools=poolinfo - 0.1\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          0    0  128  0\nbuffer-32           0    0   32  0\nxHCI 1KB stream ctx arrays    0    0 1024  0\nxHCI 256 byte stream ctx arrays    0    0  256  0\nxHCI input/output contexts   15   20 2112 20\nxHCI ring segments   46   76 4096 76\nbuffer-2048         0   32 2048 16\nbuffer-512          0   32  512  4\nbuffer-128          3   32  128  1\nbuffer-32           0  128   32  1\n
-A: power/control=on\n
-A: power/runtime_active_time=775799103\n
-A: power/runtime_status=active\n
-A: power/runtime_suspended_time=0\n
-A: power/wakeup=enabled\n
-A: power/wakeup_abort_count=0\n
-A: power/wakeup_active=0\n
-A: power/wakeup_active_count=61\n
-A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=61\n
-A: power/wakeup_last_time_ms=773160682\n
-A: power/wakeup_max_time_ms=108\n
-A: power/wakeup_total_time_ms=6358\n
-A: power_state=D0\n
-A: resource=0x00000000b1320000 0x00000000b132ffff 0x0000000000140204\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n0x0000000000000000 0x0000000000000000 0x0000000000000000\n
-A: revision=0x10\n
-A: subsystem_device=0x312a\n
-A: subsystem_vendor=0x17aa\n
-A: vendor=0x8086\n
-
--- a/tests/virtual-device.py
+++ b/tests/virtual-device.py
@ -322,7 +322,7 @@ class VirtualDeviceBase(unittest.TestCase):
            else:
                self.assertFalse(match)

-        if isinstance(scan_nick, str) and not self.dev.has_storage():
+        if isinstance(scan_nick, str):
            self.assertEqual(self._verify_fp.props.fpi_data.get_string(), scan_nick)


@ -470,8 +470,15 @@ class VirtualDevice(VirtualDeviceBase):
    def test_enroll_verify_no_match(self):
        matching = self.enroll_print('testprint', FPrint.Finger.LEFT_RING)

-        self.check_verify(matching, 'not-testprint', match=False,
-            identify=self.dev.supports_identify())
+        if self.dev.has_storage():
+            with self.assertRaises(GLib.Error) as error:
+                self.check_verify(matching, 'not-testprint', match=False,
+                    identify=self.dev.supports_identify())
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
+        else:
+            self.check_verify(matching, 'not-testprint', match=False,
+                identify=self.dev.supports_identify())

    def test_enroll_verify_error(self):
        matching = self.enroll_print('testprint', FPrint.Finger.LEFT_RING)
@ -590,11 +597,14 @@ class VirtualDevice(VirtualDeviceBase):
                                                FPrint.DeviceRetry.TOO_SHORT))

        self.send_command('SCAN', 'another-id')
-        verify_match, verify_fp = self.dev.verify_sync(enrolled)
-        self.assertFalse(verify_match)
        if self.dev.has_storage():
-            self.assertIsNone(verify_fp)
+            with self.assertRaises(GLib.GError) as error:
+                self.dev.verify_sync(enrolled)
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
        else:
+            verify_match, verify_fp = self.dev.verify_sync(enrolled)
+            self.assertFalse(verify_match)
            self.assertFalse(verify_fp.equal(enrolled))

        self.send_auto(enrolled)
@ -811,7 +821,13 @@ class VirtualDevice(VirtualDeviceBase):
        self.wait_timeout(10)
        self.assertFalse(self._verify_completed)

-        self.complete_verify()
+        if self.dev.has_storage():
+            with self.assertRaises(GLib.Error) as error:
+                self.complete_verify()
+            self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                    FPrint.DeviceError.DATA_NOT_FOUND))
+        else:
+            self.complete_verify()
        self.assertTrue(self._verify_reported)

    def test_close_error(self):
@ -1143,12 +1159,18 @@ class VirtualDeviceStorage(VirtualDevice):
                                                FPrint.DeviceError.DATA_NOT_FOUND))

    def test_verify_missing_print(self):
-        self.check_verify(FPrint.Print.new(self.dev),
-            'not-existing-print', False, identify=False)
+        with self.assertRaises(GLib.Error) as error:
+            self.check_verify(FPrint.Print.new(self.dev),
+                'not-existing-print', False, identify=False)
+        self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                FPrint.DeviceError.DATA_NOT_FOUND))

    def test_identify_missing_print(self):
-        self.check_verify(FPrint.Print.new(self.dev),
-                          'not-existing-print', False, identify=True)
+        with self.assertRaises(GLib.Error) as error:
+            self.check_verify(FPrint.Print.new(self.dev),
+                              'not-existing-print', False, identify=True)
+        self.assertTrue(error.exception.matches(FPrint.DeviceError.quark(),
+                                                FPrint.DeviceError.DATA_NOT_FOUND))


 if __name__ == '__main__':