print: Reject enroll images that can't be matched

If the score of a print matching itself is too low to match, then
reject it. It can never match and it is therefore completely useless.

Also change this into a non-fatal error, the user is free to retry the
enroll step in the hope that more minutiae is found (e.g. longer swipe).

NEWS

@@ -1,17 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
-2022-05-24: v1.94.4 release
-
-Highlights:
- * synaptics: New PIDs 0x0168, 0x015f
- * elan: New PID 0x0c4b
- * elanspi: New PID 0x241f
- * synaptics: Minor fix to interrupt transfer resubmission
- * Avoid sysfs writes if value is already expected
- * Improvements to the testing setup
- * Fixes to the internal critical section API
-
 2021-11-02: v1.94.3 release
 
 Highlights:

data/autosuspend.hwdb

@@ -146,7 +146,6 @@ usb:v04F3p0C58*
 usb:v04F3p0C7D*
 usb:v04F3p0C7E*
 usb:v04F3p0C82*
-usb:v04F3p0C88*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -191,7 +190,6 @@ usb:v06CBp0123*
 usb:v06CBp0126*
 usb:v06CBp0129*
 usb:v06CBp0168*
-usb:v06CBp015F*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
@@ -259,7 +257,6 @@ usb:v138Ap0091*
  ID_PERSIST=0
 
 # Known unsupported devices
-usb:v04E8p730B*
 usb:v04F3p036B*
 usb:v04F3p0C00*
 usb:v04F3p0C4C*
@@ -282,7 +279,6 @@ usb:v06CBp00C9*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
 usb:v06CBp00DC*
-usb:v06CBp00E4*
 usb:v06CBp00E7*
 usb:v06CBp00E9*
 usb:v06CBp00FD*
@@ -298,7 +294,6 @@ usb:v0A5Cp5845*
 usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v10A5p9200*
-usb:v10A5p9800*
 usb:v1188p9545*
 usb:v138Ap0007*
 usb:v138Ap003A*
@@ -320,7 +315,6 @@ usb:v1C7Ap0576*
 usb:v27C6p5042*
 usb:v27C6p5110*
 usb:v27C6p5117*
-usb:v27C6p5125*
 usb:v27C6p5201*
 usb:v27C6p521D*
 usb:v27C6p5301*
@@ -332,7 +326,6 @@ usb:v27C6p5385*
 usb:v27C6p538C*
 usb:v27C6p538D*
 usb:v27C6p5395*
-usb:v27C6p5503*
 usb:v27C6p5584*
 usb:v27C6p55A2*
 usb:v27C6p55A4*

doc/libfprint-2-sections.txt

@@ -40,8 +40,6 @@ fp_device_has_feature
 fp_device_has_storage
 fp_device_supports_identify
 fp_device_supports_capture
-fp_device_get_persistent_data
-fp_device_set_persistent_data
 fp_device_is_open
 fp_device_open
 fp_device_close

libfprint/drivers/elanmoc/elanmoc.c

@@ -28,7 +28,6 @@ static const FpIdEntry id_table[] = {
   { .vid = 0x04f3,  .pid = 0x0c7d,  },
   { .vid = 0x04f3,  .pid = 0x0c7e,  },
   { .vid = 0x04f3,  .pid = 0x0c82,  },
-  { .vid = 0x04f3,  .pid = 0x0c88,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 
@@ -759,7 +758,6 @@ identify_status_report (FpiDeviceElanmoc *self, int verify_status_id,
 }
 
 enum identify_states {
-  IDENTIFY_SET_MODE,
   IDENTIFY_WAIT_FINGER,
   IDENTIFY_NUM_STATES,
 };
@@ -795,13 +793,6 @@ elan_identify_run_state (FpiSsm *ssm, FpDevice *dev)
   fp_info ("elanmoc %s ", __func__);
   switch (fpi_ssm_get_cur_state (ssm))
     {
-    case IDENTIFY_SET_MODE:
-      fp_info ("elanmoc %s IDENTIFY_SET_MODE", __func__);
-      cmd_buf = elanmoc_compose_cmd (&elanmoc_set_mod_cmd);
-      cmd_buf[3] = 0x03;
-      elanmoc_get_cmd (dev, cmd_buf, elanmoc_set_mod_cmd.cmd_len, elanmoc_set_mod_cmd.resp_len, 0, elanmoc_cmd_ack_cb);
-      break;
-
     case IDENTIFY_WAIT_FINGER:
       fp_info ("elanmoc %s VERIFY_WAIT_FINGER", __func__);
       cmd_buf = elanmoc_compose_cmd (&elanmoc_verify_cmd);

libfprint/drivers/goodixmoc/goodix.c

@@ -661,7 +661,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
   /* */
   if (resp->result >= GX_FAILED)
     {
-      fp_info ("Capture sample failed, result: 0x%x", resp->result);
+      fp_warn ("Capture sample failed, result: 0x%x", resp->result);
       fpi_device_enroll_progress (FP_DEVICE (self),
                                   self->enroll_stage,
                                   NULL,
@@ -675,7 +675,7 @@ fp_enroll_capture_cb (FpiDeviceGoodixMoc  *self,
   if ((resp->capture_data_resp.img_quality < self->sensorcfg->config[4]) ||
       (resp->capture_data_resp.img_coverage < self->sensorcfg->config[5]))
     {
-      fp_info ("Capture sample poor quality(%d): %d or coverage(%d): %d",
+      fp_warn ("Capture sample poor quality(%d): %d or coverage(%d): %d",
                self->sensorcfg->config[4],
                resp->capture_data_resp.img_quality,
                self->sensorcfg->config[5],
@@ -1041,47 +1041,6 @@ fp_init_config_cb (FpiDeviceGoodixMoc  *self,
   fpi_ssm_next_state (self->task_ssm);
 }
 
-static void
-fp_init_cb_reset_or_complete (FpiDeviceGoodixMoc  *self,
-                              gxfp_cmd_response_t *resp,
-                              GError              *error)
-{
-  if (error)
-    {
-      fp_warn ("Template storage appears to have been corrupted! Error was: %s", error->message);
-      fp_warn ("A known reason for this to happen is a firmware bug triggered by another storage area being initialized.");
-      fpi_ssm_jump_to_state (self->task_ssm, FP_INIT_RESET_DEVICE);
-    }
-  else
-    {
-      fpi_ssm_mark_completed (self->task_ssm);
-    }
-}
-
-static void
-fp_init_reset_device_cb (FpiDeviceGoodixMoc  *self,
-                         gxfp_cmd_response_t *resp,
-                         GError              *error)
-{
-  if (error)
-    {
-      fp_warn ("Reset failed: %s", error->message);
-      fpi_ssm_mark_failed (self->task_ssm, error);
-      return;
-    }
-  if ((resp->result >= GX_FAILED) && (resp->result != GX_ERROR_FINGER_ID_NOEXIST))
-    {
-      fp_warn ("Reset failed, device reported: 0x%x", resp->result);
-      fpi_ssm_mark_failed (self->task_ssm,
-                           fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                                     "Failed clear storage, result: 0x%x",
-                                                     resp->result));
-      return;
-    }
-
-  fp_warn ("Reset completed");
-  fpi_ssm_mark_completed (self->task_ssm);
-}
 
 static void
 fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
@@ -1106,30 +1065,6 @@ fp_init_sm_run_state (FpiSsm *ssm, FpDevice *device)
                          sizeof (gxfp_sensor_cfg_t),
                          fp_init_config_cb);
       break;
-
-    case FP_INIT_TEMPLATE_LIST:
-      /* List prints to check whether the template DB was corrupted.
-       * As of 2022-06-13 there is a known firmware issue that can cause the
-       * stored templates for Linux to be corrupted when the Windows storage
-       * area is initialized.
-       * In that case, we'll get a protocol failure trying to retrieve the
-       * list of prints.
-       */
-      goodix_sensor_cmd (self, MOC_CMD0_GETFINGERLIST, MOC_CMD1_DEFAULT,
-                         FALSE,
-                         (const guint8 *) &dummy,
-                         1,
-                         fp_init_cb_reset_or_complete);
-      break;
-
-    case FP_INIT_RESET_DEVICE:
-      fp_warn ("Resetting device storage, you will need to enroll all prints again!");
-      goodix_sensor_cmd (self, MOC_CMD0_DELETETEMPLATE, MOC_CMD1_DELETE_ALL,
-                         FALSE,
-                         NULL,
-                         0,
-                         fp_init_reset_device_cb);
-      break;
     }
 
 

libfprint/drivers/goodixmoc/goodix.h

@@ -35,8 +35,6 @@ typedef enum {
 typedef enum {
   FP_INIT_VERSION = 0,
   FP_INIT_CONFIG,
-  FP_INIT_TEMPLATE_LIST,
-  FP_INIT_RESET_DEVICE,
   FP_INIT_NUM_STATES,
 } FpInitState;
 

libfprint/drivers/goodixmoc/goodix_proto.c

@@ -393,8 +393,10 @@ gx_proto_parse_body (uint16_t cmd, uint8_t *buffer, uint16_t buffer_len, pgxfp_c
                                        fingerid_length,
                                        &presp->finger_list_resp.finger_list[num]) != 0)
             {
-              g_warning ("Failed to parse finger list");
+              g_error ("parse fingerlist error");
-              return -1;
+              presp->finger_list_resp.finger_num = 0;
+              presp->result = GX_FAILED;
+              break;
             }
           offset += fingerid_length;
         }

libfprint/drivers/synaptics/synaptics.c

@@ -43,7 +43,6 @@ static const FpIdEntry id_table[] = {
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0126,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0129,  },
   { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x0168,  },
-  { .vid = SYNAPTICS_VENDOR_ID,  .pid = 0x015F,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };
 

libfprint/fp-device-private.h

@@ -61,7 +61,6 @@ typedef struct
   FpDeviceFeature features;
 
   guint64         driver_data;
-  GVariant       *persistent_data;
 
   gint            nr_enroll_stages;
   GSList         *sources;

libfprint/fp-device.c

@@ -54,7 +54,6 @@ enum {
   PROP_FPI_UDEV_DATA_SPIDEV,
   PROP_FPI_UDEV_DATA_HIDRAW,
   PROP_FPI_DRIVER_DATA,
-  PROP_FPI_PERSISTENT_DATA,
   N_PROPS
 };
 
@@ -236,8 +235,6 @@ fp_device_finalize (GObject *object)
   g_clear_pointer (&priv->udev_data.spidev_path, g_free);
   g_clear_pointer (&priv->udev_data.hidraw_path, g_free);
 
-  g_clear_pointer (&priv->persistent_data, g_variant_unref);
-
   G_OBJECT_CLASS (fp_device_parent_class)->finalize (object);
 }
 
@@ -307,10 +304,6 @@ fp_device_get_property (GObject    *object,
         g_value_set_string (value, NULL);
       break;
 
-    case PROP_FPI_PERSISTENT_DATA:
-      g_value_set_variant (value, priv->persistent_data);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -361,11 +354,6 @@ fp_device_set_property (GObject      *object,
       priv->driver_data = g_value_get_uint64 (value);
       break;
 
-    case PROP_FPI_PERSISTENT_DATA:
-      g_clear_pointer (&priv->persistent_data, g_variant_unref);
-      priv->persistent_data = g_value_dup_variant (value);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -606,21 +594,6 @@ fp_device_class_init (FpDeviceClass *klass)
                          0,
                          G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
 
-  /**
-   * FpDevice::fpi-persistent-data: (skip)
-   *
-   * This property is only for internal purposes.
-   *
-   * Stability: private
-   */
-  properties[PROP_FPI_PERSISTENT_DATA] =
-    g_param_spec_variant ("fpi-persistent-data",
-                          "Persistent Driver Data",
-                          "Private: Previously stored data for the device",
-                          G_VARIANT_TYPE_ANY,
-                          NULL,
-                          G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-
   g_object_class_install_properties (object_class, N_PROPS, properties);
 }
 
@@ -766,139 +739,6 @@ fp_device_get_temperature (FpDevice *device)
   return priv->temp_current;
 }
 
-/**
- * fp_device_get_persistent_data:
- * @device: A #FpDevice
- * @data: (array length=length) (transfer full) (out): Return location for data pointer
- * @length: (transfer full) (out): Length of @data
- * @error: Return location for error
- *
- * Retrieves persistent data that should be stored for this device. Storage
- * needs to be device specific, i.e. device ID and driver must match when
- * restored.
- *
- * Returns: (type void): %TRUE on success
- */
-gboolean
-fp_device_get_persistent_data (FpDevice *device,
-                               guchar  **data,
-                               gsize    *length,
-                               GError  **error)
-{
-  g_autoptr(GVariant) res = NULL;
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-
-  g_assert (data);
-  g_assert (length);
-
-  if (priv->persistent_data == NULL)
-    {
-      *data = NULL;
-      *length = 0;
-
-      return TRUE;
-    }
-
-  /* Version + variant from driver */
-  res = g_variant_new ("(issv)",
-                       1,
-                       fp_device_get_driver (device),
-                       priv->device_id,
-                       priv->persistent_data);
-
-  *length = g_variant_get_size (res);
-  *data = g_malloc (*length);
-  g_variant_store (res, *data);
-
-  return TRUE;
-}
-
-/**
- * fp_device_get_persistent_data:
- * @device: A #FpDevice
- * @data: (array length=length) (transfer none): Persistent Data
- * @length: (transfer none): Length of @data
- * @error: Return location for error
- *
- * Load persistent data from storage. This function should be called after
- * a device was discovered and before it is opened for the first time. It is
- * an error to call it if data has already been set (or generated by the
- * driver).
- *
- * Note that the driver may update the data. The API user should retrieve the
- * value when done with the device and store it in a persistent location.
- *
- * Returns: (type void): %TRUE on success
- */
-gboolean
-fp_device_set_persistent_data (FpDevice *device,
-                               guchar   *data,
-                               gsize     length,
-                               GError  **error)
-{
-  g_autoptr(GVariant) stored = NULL;
-  g_autoptr(GVariant) loaded = NULL;
-  FpDevicePrivate *priv = fp_device_get_instance_private (device);
-  guchar *copy;
-  gint version;
-  const gchar *device_id;
-  const gchar *driver;
-
-  if (priv->is_open)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                   "Data can only be set right after device creation");
-      return FALSE;
-    }
-
-  if (priv->persistent_data)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
-                   "Data has already been set");
-      return FALSE;
-    }
-
-  if (length == 0)
-    {
-      g_clear_pointer (&priv->persistent_data, g_variant_unref);
-      g_object_notify_by_pspec (G_OBJECT (device), properties[PROP_FPI_PERSISTENT_DATA]);
-      return TRUE;
-    }
-  g_assert (data);
-
-  copy = g_memdup (data, length);
-  stored = g_variant_new_from_data (G_VARIANT_TYPE ("(issv)"), copy, length, FALSE, g_free, copy);
-
-  if (!stored)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
-                   "Data could not be parsed");
-      return FALSE;
-    }
-
-  g_variant_get (stored, "(issv)", &version, &driver, &device_id, &loaded);
-  if (version != 1)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
-                   "Unknown data storage version");
-      return FALSE;
-    }
-
-  if (g_strcmp0 (device_id, priv->device_id) != 0 ||
-      g_strcmp0 (driver, fp_device_get_driver (device)) != 0)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
-                   "Driver or device ID mismatch!");
-      return FALSE;
-    }
-
-  g_clear_pointer (&priv->persistent_data, g_variant_unref);
-  priv->persistent_data = g_steal_pointer (&loaded);
-  g_object_notify_by_pspec (G_OBJECT (device), properties[PROP_FPI_PERSISTENT_DATA]);
-
-  return TRUE;
-}
-
 /**
  * fp_device_supports_identify:
  * @device: A #FpDevice

libfprint/fp-device.h

@@ -230,15 +230,6 @@ FpDeviceFeature     fp_device_get_features (FpDevice *device);
 gboolean            fp_device_has_feature (FpDevice       *device,
                                            FpDeviceFeature feature);
 
-gboolean fp_device_get_persistent_data (FpDevice *device,
-                                        guchar  **data,
-                                        gsize    *length,
-                                        GError  **error);
-gboolean fp_device_set_persistent_data (FpDevice *device,
-                                        guchar   *data,
-                                        gsize     length,
-                                        GError  **error);
-
 /* Opening the device */
 void fp_device_open (FpDevice           *device,
                      GCancellable       *cancellable,

libfprint/fpi-device.c

@@ -21,7 +21,6 @@
 #define FP_COMPONENT "device"
 #include <math.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include "fpi-log.h"
 

libfprint/fpi-image-device.c

@@ -277,7 +277,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
     {
       print = fp_print_new (device);
       fpi_print_set_type (print, FPI_PRINT_NBIS);
-      if (!fpi_print_add_from_image (print, image, &error))
+      if (!fpi_print_add_from_image (print, image, priv->bz3_threshold, &error))
         {
           g_clear_object (&print);
 

libfprint/fpi-print.c

@@ -154,11 +154,14 @@ minutiae_to_xyt (struct fp_minutiae *minutiae,
 gboolean
 fpi_print_add_from_image (FpPrint *print,
                           FpImage *image,
+                          gint     bz3_threshold,
                           GError **error)
 {
+  g_autofree struct xyt_struct *xyt = NULL;
   GPtrArray *minutiae;
   struct fp_minutiae _minutiae;
-  struct xyt_struct *xyt;
+  gint probe_len;
+  gint score;
 
   if (print->type != FPI_PRINT_NBIS || !image)
     {
@@ -173,8 +176,8 @@ fpi_print_add_from_image (FpPrint *print,
   if (!minutiae || minutiae->len == 0)
     {
       g_set_error (error,
-                   G_IO_ERROR,
+                   FP_DEVICE_RETRY,
-                   G_IO_ERROR_INVALID_DATA,
+                   FP_DEVICE_RETRY_GENERAL,
                    "No minutiae found in image or not yet detected!");
       return FALSE;
     }
@@ -185,7 +188,20 @@ fpi_print_add_from_image (FpPrint *print,
 
   xyt = g_new0 (struct xyt_struct, 1);
   minutiae_to_xyt (&_minutiae, image->width, image->height, xyt);
-  g_ptr_array_add (print->prints, xyt);
+
+  probe_len = bozorth_probe_init (xyt);
+  score = bozorth_to_gallery (probe_len, xyt, xyt);
+  fp_dbg ("self-match score %d/%d", score, bz3_threshold);
+  if (score <= bz3_threshold)
+    {
+      g_set_error (error,
+                   FP_DEVICE_RETRY,
+                   FP_DEVICE_RETRY_GENERAL,
+                   "Not enough minutiae to generate a match!");
+      return FPI_MATCH_SUCCESS;
+    }
+
+  g_ptr_array_add (print->prints, g_steal_pointer (&xyt));
 
   g_clear_object (&print->image);
   print->image = g_object_ref (image);

libfprint/fpi-print.h

@@ -40,11 +40,12 @@ void     fpi_print_set_device_stored (FpPrint *print,
 
 gboolean fpi_print_add_from_image (FpPrint *print,
                                    FpImage *image,
+                                   gint     bz3_threshold,
                                    GError **error);
 
-FpiMatchResult fpi_print_bz3_match (FpPrint *temp,
+FpiMatchResult fpi_print_bz3_match (FpPrint * template,
-                                    FpPrint *print,
+                                    FpPrint * print,
-                                    gint     bz3_threshold,
+                                    gint bz3_threshold,
                                     GError **error);
 
 /* Helpers to encode metadata into user ID strings. */

libfprint/fprint-list-udev-hwdb.c

@@ -29,7 +29,6 @@ static const FpIdEntry whitelist_id_table[] = {
    * You can generate this list from the wiki page using e.g.:
    *   gio cat https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices.md | sed -n 's!|.*\([0-9a-fA-F]\{4\}\):\([0-9a-fA-F]\{4\}\).*|.*!  { .vid = 0x\1, .pid = 0x\2 },!p'
    */
-  { .vid = 0x04e8, .pid = 0x730b },
   { .vid = 0x04f3, .pid = 0x036b },
   { .vid = 0x04f3, .pid = 0x0c00 },
   { .vid = 0x04f3, .pid = 0x0c4c },
@@ -52,7 +51,6 @@ static const FpIdEntry whitelist_id_table[] = {
   { .vid = 0x06cb, .pid = 0x00d8 },
   { .vid = 0x06cb, .pid = 0x00da },
   { .vid = 0x06cb, .pid = 0x00dc },
-  { .vid = 0x06cb, .pid = 0x00e4 },
   { .vid = 0x06cb, .pid = 0x00e7 },
   { .vid = 0x06cb, .pid = 0x00e9 },
   { .vid = 0x06cb, .pid = 0x00fd },
@@ -68,7 +66,6 @@ static const FpIdEntry whitelist_id_table[] = {
   { .vid = 0x0bda, .pid = 0x5812 },
   { .vid = 0x10a5, .pid = 0x0007 },
   { .vid = 0x10a5, .pid = 0x9200 },
-  { .vid = 0x10a5, .pid = 0x9800 },
   { .vid = 0x1188, .pid = 0x9545 },
   { .vid = 0x138a, .pid = 0x0007 },
   { .vid = 0x138a, .pid = 0x003a },
@@ -90,7 +87,6 @@ static const FpIdEntry whitelist_id_table[] = {
   { .vid = 0x27c6, .pid = 0x5042 },
   { .vid = 0x27c6, .pid = 0x5110 },
   { .vid = 0x27c6, .pid = 0x5117 },
-  { .vid = 0x27c6, .pid = 0x5125 },
   { .vid = 0x27c6, .pid = 0x5201 },
   { .vid = 0x27c6, .pid = 0x521d },
   { .vid = 0x27c6, .pid = 0x5301 },
@@ -102,7 +98,6 @@ static const FpIdEntry whitelist_id_table[] = {
   { .vid = 0x27c6, .pid = 0x538c },
   { .vid = 0x27c6, .pid = 0x538d },
   { .vid = 0x27c6, .pid = 0x5395 },
-  { .vid = 0x27c6, .pid = 0x5503 },
   { .vid = 0x27c6, .pid = 0x5584 },
   { .vid = 0x27c6, .pid = 0x55a2 },
   { .vid = 0x27c6, .pid = 0x55a4 },

libfprint/nbis/fix-musl-build.patch

@@ -1,31 +0,0 @@
-From 2584d440afc87d463cb8dc809d48c660e091c2c4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 23 Jun 2022 05:57:46 +0100
-Subject: [PATCH] nbis: fix build on musl
-
-Drop re-definition of stderr. There's no need for this anywhere
-(including glibc). This breaks in particular on musl because
-stderr (and stdin) are both const, and macros unlike in glibc.
-
-Bug: https://bugs.gentoo.org/853811
----
- nbis/include/bozorth.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/nbis/include/bozorth.h b/nbis/include/bozorth.h
-index a705da98..fd8975bf 100644
---- a/nbis/include/bozorth.h
-+++ b/nbis/include/bozorth.h
-@@ -217,8 +217,6 @@ struct xytq_struct {
- /**************************************************************************/
- /* Globals supporting command line options */
- extern int verbose_threshold;
--/* Global supporting error reporting */
--extern FILE *stderr;
- 
- /**************************************************************************/
- /* In: BZ_GBLS.C */
--- 
-GitLab
-
-

libfprint/nbis/include/bozorth.h

@@ -217,6 +217,8 @@ struct xytq_struct {
 /**************************************************************************/
 /* Globals supporting command line options */
 extern int verbose_threshold;
+/* Global supporting error reporting */
+extern FILE *stderr;
 
 /**************************************************************************/
 /* In: BZ_GBLS.C */

libfprint/nbis/update-from-nbis.sh

@@ -198,6 +198,3 @@ patch -p0 < fix-scan-build-reports.patch
 
 # Add pass to remove perimeter points
 patch -p0 < remove-perimeter-pts.patch
-
-# Fix build on musl by dropping unnecessary redeclaration of stderr
-patch -p0 < fix-musl-build.patch

meson.build

@@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-    version: '1.94.4',
+    version: '1.94.3',
     license: 'LGPLv2.1+',
     default_options: [
         'buildtype=debugoptimized',

scripts/uncrustify.cfg

@@ -120,7 +120,7 @@ nl_multi_line_cond              true
 # Not clear what to do about that...
 mod_full_brace_for              Remove
 mod_full_brace_if               Remove
-mod_full_brace_if_chain         1
+mod_full_brace_if_chain         True
 mod_full_brace_while            Remove
 mod_full_brace_do               Remove
 mod_full_brace_nl               3

tests/elanmoc/device

@@ -1,67 +1,63 @@
-P: /devices/pci0000:00/0000:00:14.0/usb1/1-9
+P: /devices/pci0000:00/0000:00:14.0/usb1/1-1
-N: bus/usb/001/003=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+N: bus/usb/001/010=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-E: DEVNAME=/dev/bus/usb/001/003
+E: DEVNAME=/dev/bus/usb/001/010
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=4f3/c88/8004
+E: PRODUCT=4f3/c7e/305
 E: TYPE=0/0/0
 E: BUSNUM=001
-E: DEVNUM=003
+E: DEVNUM=010
 E: MAJOR=189
-E: MINOR=2
+E: MINOR=9
 E: SUBSYSTEM=usb
 E: ID_VENDOR=ELAN
 E: ID_VENDOR_ENC=ELAN
 E: ID_VENDOR_ID=04f3
 E: ID_MODEL=ELAN:ARM-M4
 E: ID_MODEL_ENC=ELAN:ARM-M4
-E: ID_MODEL_ID=0c88
+E: ID_MODEL_ID=0c7e
-E: ID_REVISION=8004
+E: ID_REVISION=0305
 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:9
+E: ID_PATH=pci-0000:00:14.0-usb-0:1
-E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_9
+E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_1
-E: ID_FOR_SEAT=usb-pci-0000_00_14_0-usb-0_9
-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: bMaxPacketSize0=64\n
 A: bMaxPower=100mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=8004\n
+A: bcdDevice=0305\n
 A: bmAttributes=a0\n
 A: busnum=1\n
-A: configuration=
+A: configuration=add909c9-e67e-4126-a6f7-1e31179e27d9\n
-H: descriptors=1201000200000008F304880C04800102000109025300010100A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
+H: descriptors=1201000200000040F3047E0C05030102000109025300010103A0320904000008FF0000000921100100012215000705810240000107050102400001070582024000010705020240000107058302400001070503024000010705840240000107050402400001
-A: dev=189:2\n
+A: dev=189:9\n
-A: devnum=3\n
+A: devnum=10\n
-A: devpath=9\n
+A: devpath=1\n
 L: driver=../../../../../bus/usb/drivers/usb
-L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d/device:3e/device:47
+A: idProduct=0c7e\n
-A: idProduct=0c88\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-port9
+L: port=../1-0:1.0/usb1-port1
-A: power/active_duration=35269124\n
+A: power/active_duration=94712\n
 A: power/async=enabled\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=35283788\n
+A: power/connected_duration=94712\n
 A: power/control=on\n
 A: power/level=on\n
-A: power/persist=0\n
+A: power/persist=1\n
 A: power/runtime_active_kids=0\n
-A: power/runtime_active_time=35276624\n
+A: power/runtime_active_time=94436\n
 A: power/runtime_enabled=forbidden\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -81,40 +77,38 @@ A: removable=removable\n
 A: rx_lanes=1\n
 A: speed=12\n
 A: tx_lanes=1\n
-A: urbnum=2773\n
+A: urbnum=12\n
 A: version= 2.00\n
 
 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/515
+E: PRODUCT=1d6b/2/504
 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.15.0-39-generic_xhci-hcd
+E: ID_VENDOR=Linux_5.4.0-42-generic_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.15.0-39-generic\x20xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.4.0-42-generic\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=0515
+E: ID_REVISION=0504
-E: ID_SERIAL=Linux_5.15.0-39-generic_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL=Linux_5.4.0-42-generic_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
@@ -126,31 +120,30 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0515\n
+A: bcdDevice=0504\n
 A: bmAttributes=e0\n
 A: busnum=1\n
-A: configuration=
+A: configuration=\n
-H: descriptors=12010002090001406B1D020015050302010109021900010100E0000904000001090000000705810304000C
+H: descriptors=12010002090001406B1D020004050302010109021900010100E0000904000001090000000705810304000C
 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:3d/device:3e
 A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
-A: manufacturer=Linux 5.15.0-39-generic xhci-hcd\n
+A: manufacturer=Linux 5.4.0-42-generic xhci-hcd\n
-A: maxchild=14\n
+A: maxchild=12\n
-A: power/active_duration=35270364\n
+A: power/active_duration=74604360\n
 A: power/async=enabled\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=35284300\n
+A: power/connected_duration=74606456\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_kids=2\n
+A: power/runtime_active_kids=4\n
-A: power/runtime_active_time=35277420\n
+A: power/runtime_active_time=74605838\n
 A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
@@ -171,63 +164,62 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=549\n
+A: urbnum=490\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:8C31
+E: PCI_ID=8086:9DED
-E: PCI_SUBSYS_ID=1043:201F
+E: PCI_SUBSYS_ID=103C:85EF
 E: PCI_SLOT_NAME=0000:00:14.0
-E: MODALIAS=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30
+E: MODALIAS=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30
 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=8 Series/C220 Series Chipset Family USB xHCI
+E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
-H: config=8680318C060490020530030C000000000400A0F700000000000000000000000000000000000000000000000043101F200000000070000000000000000B010000FD01368089C60F8000000000000000009F6E8807000000000000000000000000302000000000000000000000000000000180C2C1080000000000000000000000050087000410E0FE000000002F00000000000000000000000000000000000000400100000000000000000000000000000F000100000000000000000000000000030420C0030C3000030C300000000000FF1A0000FF1A00003F0000003F000000A00000000000000000000000D8D8D8080000000000000000B10F060800000000
+H: config=8680ED9D060490023030030C00008000040030A10000000000000000000000000000000000000000000000003C10EF85000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000181C030400000000316000000000000000000000000000000180C2C1080000000000000000000000059087007802E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000B50F300112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
-A: device=0x8c31\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)\n
 A: enable=1\n
-L: firmware_node=../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:3d
+A: irq=124\n
-A: irq=31\n
 A: local_cpulist=0-3\n
 A: local_cpus=f\n
-A: modalias=pci:v00008086d00008C31sv00001043sd0000201Fbc0Csc03i30\n
+A: modalias=pci:v00008086d00009DEDsv0000103Csd000085EFbc0Csc03i30\n
 A: msi_bus=1\n
-A: msi_irqs/31=msi\n
+A: msi_irqs/124=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    5    6 2112  6\nxHCI ring segments   24   24 4096 24\nbuffer-2048         0    0 2048  0\nbuffer-512          0    0  512  0\nbuffer-128          3   32  128  1\nbuffer-32           0    0   32  0\n
+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\n
 A: power/async=enabled\n
-A: power/control=on\n
+A: power/control=auto\n
 A: power/runtime_active_kids=1\n
-A: power/runtime_active_time=35278060\n
+A: power/runtime_active_time=74606194\n
-A: power/runtime_enabled=forbidden\n
+A: power/runtime_enabled=enabled\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
-A: power/runtime_usage=1\n
+A: power/runtime_usage=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=5\n
+A: power/wakeup_active_count=0\n
 A: power/wakeup_count=0\n
-A: power/wakeup_expire_count=5\n
+A: power/wakeup_expire_count=0\n
-A: power/wakeup_last_time_ms=12694896\n
+A: power/wakeup_last_time_ms=0\n
-A: power/wakeup_max_time_ms=103\n
+A: power/wakeup_max_time_ms=0\n
-A: power/wakeup_total_time_ms=518\n
+A: power/wakeup_total_time_ms=0\n
-A: power_state=D0\n
+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\n
-A: resource=0x00000000f7a00000 0x00000000f7a0ffff 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=0x30\n
-A: revision=0x05\n
+A: subsystem_device=0x85ef\n
-A: subsystem_device=0x201f\n
+A: subsystem_vendor=0x103c\n
-A: subsystem_vendor=0x1043\n
 A: vendor=0x8086\n
 

tests/goodixmoc/custom.py

@@ -25,9 +25,6 @@ assert d.has_feature(FPrint.DeviceFeature.STORAGE_CLEAR)
 
 d.open_sync()
 
-# 1. verify clear storage command, 2. make sure later asserts are good
-d.clear_storage_sync()
-
 template = FPrint.Print.new(d)
 
 def enroll_progress(*args):

tests/goodixmoc/device

@@ -1,14 +1,14 @@
 P: /devices/pci0000:00/0000:00:14.0/usb1/1-3
-N: bus/usb/001/023=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
+N: bus/usb/001/053=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-E: DEVNAME=/dev/bus/usb/001/023
+E: DEVNAME=/dev/bus/usb/001/053
 E: DEVTYPE=usb_device
 E: DRIVER=usb
 E: PRODUCT=27c6/6496/100
 E: TYPE=239/0/0
 E: BUSNUM=001
-E: DEVNUM=023
+E: DEVNUM=053
 E: MAJOR=189
-E: MINOR=22
+E: MINOR=52
 E: SUBSYSTEM=usb
 E: ID_VENDOR=Goodix_Technology_Co.__Ltd.
 E: ID_VENDOR_ENC=Goodix\x20Technology\x20Co.\x2c\x20Ltd.
@@ -23,7 +23,6 @@ E: ID_BUS=usb
 E: ID_USB_INTERFACES=:ff0000:
 E: ID_VENDOR_FROM_DATABASE=Shenzhen Goodix Technology Co.,Ltd.
 E: ID_AUTOSUSPEND=1
-E: ID_PERSIST=0
 E: ID_PATH=pci-0000:00:14.0-usb-0:3
 E: ID_PATH_TAG=pci-0000_00_14_0-usb-0_3
 A: authorized=1\n
@@ -41,8 +40,8 @@ A: bmAttributes=a0\n
 A: busnum=1\n
 A: configuration=XXXX_MOC_B0\n
 H: descriptors=12010002EF000040C627966400010102030109022000010103A0320904000002FF0000040705830240000007050102400000
-A: dev=189:22\n
+A: dev=189:52\n
-A: devnum=23\n
+A: devnum=53\n
 A: devpath=3\n
 L: driver=../../../../../bus/usb/drivers/usb
 L: firmware_node=../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/device:1d/device:20
@@ -52,16 +51,16 @@ A: ltm_capable=no\n
 A: manufacturer=Goodix Technology Co., Ltd.\n
 A: maxchild=0\n
 L: port=../1-0:1.0/usb1-port3
-A: power/active_duration=22667\n
+A: power/active_duration=29262\n
 A: power/autosuspend=2\n
 A: power/autosuspend_delay_ms=2000\n
-A: power/connected_duration=917616\n
+A: power/connected_duration=57399\n
 A: power/control=auto\n
 A: power/level=auto\n
 A: power/persist=1\n
-A: power/runtime_active_time=22809\n
+A: power/runtime_active_time=29308\n
 A: power/runtime_status=active\n
-A: power/runtime_suspended_time=894564\n
+A: power/runtime_suspended_time=27850\n
 A: power/wakeup=disabled\n
 A: power/wakeup_abort_count=\n
 A: power/wakeup_active=\n
@@ -78,29 +77,29 @@ A: rx_lanes=1\n
 A: serial=XXXX_MOC_B0\n
 A: speed=12\n
 A: tx_lanes=1\n
-A: urbnum=298\n
+A: urbnum=394\n
 A: version= 2.00\n
 
 P: /devices/pci0000:00/0000:00:14.0/usb1
-N: bus/usb/001/001=12010002090001406B1D020017050302010109021900010100E0000904000001090000000705810304000C
+N: bus/usb/001/001=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
 E: DEVNAME=/dev/bus/usb/001/001
 E: DEVTYPE=usb_device
 E: DRIVER=usb
-E: PRODUCT=1d6b/2/517
+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.17.12-300.fc36.x86_64_xhci-hcd
+E: ID_VENDOR=Linux_5.13.15-200.fc34.x86_64_xhci-hcd
-E: ID_VENDOR_ENC=Linux\x205.17.12-300.fc36.x86_64\x20xhci-hcd
+E: ID_VENDOR_ENC=Linux\x205.13.15-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=0517
+E: ID_REVISION=0513
-E: ID_SERIAL=Linux_5.17.12-300.fc36.x86_64_xhci-hcd_xHCI_Host_Controller_0000:00:14.0
+E: ID_SERIAL=Linux_5.13.15-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:
@@ -123,11 +122,11 @@ A: bMaxPacketSize0=64\n
 A: bMaxPower=0mA\n
 A: bNumConfigurations=1\n
 A: bNumInterfaces= 1\n
-A: bcdDevice=0517\n
+A: bcdDevice=0513\n
 A: bmAttributes=e0\n
 A: busnum=1\n
 A: configuration=\n
-H: descriptors=12010002090001406B1D020017050302010109021900010100E0000904000001090000000705810304000C
+H: descriptors=12010002090001406B1D020013050302010109021900010100E0000904000001090000000705810304000C
 A: dev=189:0\n
 A: devnum=1\n
 A: devpath=0\n
@@ -137,15 +136,15 @@ A: idProduct=0002\n
 A: idVendor=1d6b\n
 A: interface_authorized_default=1\n
 A: ltm_capable=no\n
-A: manufacturer=Linux 5.17.12-300.fc36.x86_64 xhci-hcd\n
+A: manufacturer=Linux 5.13.15-200.fc34.x86_64 xhci-hcd\n
 A: maxchild=12\n
-A: power/active_duration=164289796\n
+A: power/active_duration=219578717\n
 A: power/autosuspend=0\n
 A: power/autosuspend_delay_ms=0\n
-A: power/connected_duration=164360220\n
+A: power/connected_duration=219649620\n
 A: power/control=auto\n
 A: power/level=auto\n
-A: power/runtime_active_time=164331876\n
+A: power/runtime_active_time=219589127\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/wakeup=disabled\n
@@ -164,14 +163,14 @@ A: rx_lanes=1\n
 A: serial=0000:00:14.0\n
 A: speed=480\n
 A: tx_lanes=1\n
-A: urbnum=2097\n
+A: urbnum=4325\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=17AA:2292
+E: PCI_SUBSYS_ID=17AA:2292\n
 E: PCI_SLOT_NAME=0000:00:14.0
 E: MODALIAS=pci:v00008086d00009DEDsv000017AAsd00002292bc0Csc03i30
 E: SUBSYSTEM=pci
@@ -184,7 +183,7 @@ E: ID_MODEL_FROM_DATABASE=Cannon Point-LP USB 3.1 xHCI Controller
 A: ari_enabled=0\n
 A: broken_parity_status=0\n
 A: class=0x0c0330\n
-H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F00000000F507312600000000316000000000000000000000000000000180C2C1080000000000000000000000059087001803E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000000000000000000008000000040000000000000000000000000000000000000000000000000000000800000004000000000000000000000000000000000000000000000000000000B50F320112000000
+H: config=8680ED9D060490021130030C00008000040022EA000000000000000000000000000000000000000000000000AA179222000000007000000000000000FF010000FD0134808FC6FF8300000000000000007F6DDC0F000000004C084B0100000000316000000000000000000000000000000180C2C1080000000000000000000000059087001803E0FE0000000000000000090014F01000400100000000C10A080000080E00001800008F40020000010000000000000000000008000000040000000000000000000000000000000000000000000000000000000800000004000000000000000000000000000000000000000000000000000000B50F320112000000
 A: consistent_dma_mask_bits=64\n
 A: d3cold_allowed=1\n
 A: dbc=disabled\n
@@ -202,8 +201,8 @@ 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   46   50 4096 50\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=auto\n
+A: power/control=on\n
-A: power/runtime_active_time=164332777\n
+A: power/runtime_active_time=219589302\n
 A: power/runtime_status=active\n
 A: power/runtime_suspended_time=0\n
 A: power/wakeup=enabled\n

tests/test-fp-device.c

@@ -232,53 +232,6 @@ test_device_has_storage (void)
   G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
-static void
-test_device_persistent_data (void)
-{
-  g_autoptr(FptContext) tctx = fpt_context_new_with_virtual_device (FPT_VIRTUAL_DEVICE_IMAGE);
-  g_autoptr(GVariant) initial = NULL;
-  g_autoptr(GVariant) loaded = NULL;
-  g_autoptr(GError) error = NULL;
-  guint8 *data = (guint8 *) 0xdeadbeef;
-  gsize length = 1;
-
-  initial = g_variant_ref_sink (g_variant_new ("(s)", "stored data"));
-
-  g_assert_true (fp_device_get_persistent_data (tctx->device, &data, &length, &error));
-  g_assert_cmpint (length, ==, 0);
-  g_assert_null (data);
-  g_assert_no_error (error);
-
-  /* Use the fact that this is a property that we can poke from the outside. */
-  g_object_set (tctx->device, "fpi-persistent-data", initial, NULL);
-
-  /* Works now */
-  g_assert_true (fp_device_get_persistent_data (tctx->device, &data, &length, &error));
-  g_assert_cmpint (length, !=, 0);
-  g_assert_nonnull (data);
-  g_assert_no_error (error);
-
-  /* We can't load the data, as data has been set already. */
-  g_assert_false (fp_device_set_persistent_data (tctx->device, data, length, &error));
-  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_EXISTS);
-  g_clear_pointer (&error, g_error_free);
-
-  /* Abuse that we can "load" again if the data is set to NULL.
-   * This is an implementation detail and just a lack of error checking. */
-  g_object_set (tctx->device, "fpi-persistent-data", NULL, NULL);
-
-  /* Incomplete data, causes parsing error */
-  g_assert_false (fp_device_set_persistent_data (tctx->device, data, 5, &error));
-  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA);
-  g_clear_pointer (&error, g_error_free);
-
-  g_assert_true (fp_device_set_persistent_data (tctx->device, data, length, &error));
-  g_assert_no_error (error);
-
-  g_object_get (tctx->device, "fpi-persistent-data", &loaded, NULL);
-  g_assert_cmpvariant (initial, loaded);
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -299,7 +252,6 @@ main (int argc, char *argv[])
   g_test_add_func ("/device/sync/supports_identify", test_device_supports_identify);
   g_test_add_func ("/device/sync/supports_capture", test_device_supports_capture);
   g_test_add_func ("/device/sync/has_storage", test_device_has_storage);
-  g_test_add_func ("/device/persistent_data", test_device_persistent_data);
 
   return g_test_run ();
 }