upekts: Fix error reporting during verify

We delayed the wrong error types for the early reporting mechanism.
upekts: Fix error handling in verify_stop_deinit_cb
2025-11-15 07:38:12 +00:00 · 2020-06-05 14:48:57 +00:00 · 2020-06-05 14:48:57 +00:00 · 2020-06-05 14:48:57 +00:00 · 2020-06-05 14:48:57 +00:00 · 2020-06-05 14:48:57 +00:00
56 changed files with 949 additions and 244 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,9 @@ include:

 variables:
  extends: .libfprint_common_variables
-  FEDORA_TAG: rawhide
-  FEDORA_VERSION: rawhide
-  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
+  FDO_DISTRIBUTION_TAG: latest
+  FDO_DISTRIBUTION_VERSION: rawhide
+  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"

@@ -16,7 +16,7 @@ stages:
  - check-source
  - build
  - test
-  - flatpack
+  - flatpak

 image: "$FEDORA_IMAGE"

@@ -48,6 +48,11 @@ build:
  <<: *build_one_driver
  <<: *build
 #  <<: *check_abi
+  artifacts:
+    expose_as: "HTML Documentation"
+    paths:
+    - _build/doc/html/
+    expire_in: 1 week

 test:
  stage: test
@@ -59,6 +64,7 @@ test:
    - ninja -C _build
    - meson test -C _build --verbose --no-stdsplit --timeout-multiplier 3
    - ninja -C _build coverage
+    - cat _build/meson-logs/coverage.txt
  artifacts:
    paths:
      - _build/meson-logs
@@ -74,13 +80,32 @@ test_valgrind:
    - ninja -C _build
    - meson test -C _build --verbose --no-stdsplit --setup=valgrind

+test_scan_build:
+  stage: test
+  except:
+    variables:
+      - $CI_PIPELINE_SOURCE == "schedule"
+  allow_failure: true
+  script:
+    - meson -Ddrivers=all . _build
+    # This is ugly, the wrapper disables the malloc checker
+    - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build ninja -C _build scan-build
+    # Check that the directory is empty
+    - "! ls -A _build/meson-logs/scanbuild | grep -q ."
+  artifacts:
+    paths:
+      - _build/meson-logs
+    expire_in: 1 week
+
 test_indent:
  stage: check-source
  except:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule"
  script:
-    - scripts/uncrustify.sh --check
+    - scripts/uncrustify.sh
+    - git diff
+    - "! git status -s | grep -q ."

 .flatpak_script_template: &flatpak_script
    script:
@@ -107,7 +132,7 @@ test_indent:

 .flatpak_master_template: &flatpak_master
    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
-    stage: flatpack
+    stage: flatpak
    variables:
        MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
        # From demo/org.freedesktop.libfprint.Demo.json
@@ -135,11 +160,11 @@ flatpak-manual master:

 # CONTAINERS creation stage
 container_fedora_build:
-  extends: .fedora@container-build
+  extends: .fdo.container-build@fedora
  only:
    variables:
      - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
  variables:
    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
    # a list of packages to install
-    FEDORA_RPMS: $LIBFPRINT_DEPENDENCIES
+    FDO_DISTRIBUTION_PACKAGES: $LIBFPRINT_DEPENDENCIES
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@@ -24,3 +24,4 @@
    umockdev
    uncrustify
    valgrind
+    clang-analyzer
--- a/.gitlab-ci/scan-build
+++ b/.gitlab-ci/scan-build
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# This wrapper just disables the malloc checker
+exec /usr/bin/scan-build -disable-checker unix.Malloc "$@"
--- a/13
+++ b/13
@@ -0,0 +1,13 @@
+Current maintainers of libfprint are:
+
+ * Benjamin Berg <bberg@redhat.com>
+ * Marco Trevisan (Treviño) <mail@3v1n0.net>
+
+Many drivers are not actively maintained and may not be fully functional.
+We are happy to receive contributions, but the support we can give is
+limitted unfortunately. For many drivers we may not even have test devices.
+
+Maintained drivers are:
+ * synaptics:
+   Contributed and maintained by Synaptics Inc.
+   Contact: Vincent Huang <vincent.huang@tw.synaptics.com>
--- a/doc/libfprint-2-sections.txt
+++ b/doc/libfprint-2-sections.txt
@@ -175,7 +175,7 @@ fpi_image_resize

 <SECTION>
 <FILE>fpi-image-device</FILE>
-<TITLE>FpImageDevice</TITLE>
+<TITLE>Internal FpImageDevice</TITLE>
 FpiImageDeviceState
 FpImageDeviceClass
 fpi_image_device_session_error
@@ -207,6 +207,8 @@ fpi_print_set_type
 fpi_print_set_device_stored
 fpi_print_add_from_image
 fpi_print_bz3_match
+fpi_print_generate_user_id
+fpi_print_fill_from_user_id
 </SECTION>

 <SECTION>
--- a/examples/enroll.c
+++ b/examples/enroll.c
@@ -1,6 +1,6 @@
 /*
 * Example fingerprint enrollment program
- * Enrolls your choosen finger and saves the print to disk
+ * Enrolls your chosen finger and saves the print to disk
 * Copyright (C) 2007 Daniel Drake <dsd@gentoo.org>
 * Copyright (C) 2019 Marco Trevisan <marco.trevisan@canonical.com>
 *
@@ -23,20 +23,25 @@

 #include <stdio.h>
 #include <libfprint/fprint.h>
+#include <glib-unix.h>

 #include "storage.h"
 #include "utilities.h"

 typedef struct _EnrollData
 {
-  GMainLoop *loop;
-  FpFinger   finger;
-  int        ret_value;
+  GMainLoop    *loop;
+  GCancellable *cancellable;
+  unsigned int  sigint_handler;
+  FpFinger      finger;
+  int           ret_value;
 } EnrollData;

 static void
 enroll_data_free (EnrollData *enroll_data)
 {
+  g_clear_handle_id (&enroll_data->sigint_handler, g_source_remove);
+  g_clear_object (&enroll_data->cancellable);
  g_main_loop_unref (enroll_data->loop);
  g_free (enroll_data);
 }
@@ -137,11 +142,22 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
  printf ("Scan your finger now.\n");

  print_template = print_create_template (dev, enroll_data->finger);
-  fp_device_enroll (dev, print_template, NULL, on_enroll_progress, NULL,
-                    NULL, (GAsyncReadyCallback) on_enroll_completed,
+  fp_device_enroll (dev, print_template, enroll_data->cancellable,
+                    on_enroll_progress, NULL, NULL,
+                    (GAsyncReadyCallback) on_enroll_completed,
                    enroll_data);
 }

+static gboolean
+sigint_cb (void *user_data)
+{
+  EnrollData *enroll_data = user_data;
+
+  g_cancellable_cancel (enroll_data->cancellable);
+
+  return G_SOURCE_CONTINUE;
+}
+
 int
 main (void)
 {
@@ -188,8 +204,15 @@ main (void)
  enroll_data->finger = finger;
  enroll_data->ret_value = EXIT_FAILURE;
  enroll_data->loop = g_main_loop_new (NULL, FALSE);
+  enroll_data->cancellable = g_cancellable_new ();
+  enroll_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
+                                                        SIGINT,
+                                                        sigint_cb,
+                                                        enroll_data,
+                                                        NULL);

-  fp_device_open (dev, NULL, (GAsyncReadyCallback) on_device_opened,
+  fp_device_open (dev, enroll_data->cancellable,
+                  (GAsyncReadyCallback) on_device_opened,
                  enroll_data);

  g_main_loop_run (enroll_data->loop);
--- a/examples/verify.c
+++ b/examples/verify.c
@@ -23,20 +23,25 @@

 #include <stdio.h>
 #include <libfprint/fprint.h>
+#include <glib-unix.h>

 #include "storage.h"
 #include "utilities.h"

 typedef struct _VerifyData
 {
-  GMainLoop *loop;
-  FpFinger   finger;
-  int        ret_value;
+  GMainLoop    *loop;
+  GCancellable *cancellable;
+  unsigned int  sigint_handler;
+  FpFinger      finger;
+  int           ret_value;
 } VerifyData;

 static void
 verify_data_free (VerifyData *verify_data)
 {
+  g_clear_handle_id (&verify_data->sigint_handler, g_source_remove);
+  g_clear_object (&verify_data->cancellable);
  g_main_loop_unref (verify_data->loop);
  g_free (verify_data);
 }
@@ -196,7 +201,7 @@ on_list_completed (FpDevice *dev, GAsyncResult *res, gpointer user_data)
               fp_print_get_description (verify_print));

      g_print ("Print loaded. Time to verify!\n");
-      fp_device_verify (dev, verify_print, NULL,
+      fp_device_verify (dev, verify_print, verify_data->cancellable,
                        on_match_cb, verify_data, NULL,
                        (GAsyncReadyCallback) on_verify_completed,
                        verify_data);
@@ -250,7 +255,7 @@ start_verification (FpDevice *dev, VerifyData *verify_data)
        }

      g_print ("Print loaded. Time to verify!\n");
-      fp_device_verify (dev, verify_print, NULL,
+      fp_device_verify (dev, verify_print, verify_data->cancellable,
                        NULL, NULL, NULL,
                        (GAsyncReadyCallback) on_verify_completed,
                        verify_data);
@@ -276,6 +281,16 @@ on_device_opened (FpDevice *dev, GAsyncResult *res, void *user_data)
  start_verification (dev, verify_data);
 }

+static gboolean
+sigint_cb (void *user_data)
+{
+  VerifyData *verify_data = user_data;
+
+  g_cancellable_cancel (verify_data->cancellable);
+
+  return G_SOURCE_CONTINUE;
+}
+
 int
 main (void)
 {
@@ -306,8 +321,14 @@ main (void)
  verify_data = g_new0 (VerifyData, 1);
  verify_data->ret_value = EXIT_FAILURE;
  verify_data->loop = g_main_loop_new (NULL, FALSE);
-
-  fp_device_open (dev, NULL, (GAsyncReadyCallback) on_device_opened,
+  verify_data->cancellable = g_cancellable_new ();
+  verify_data->sigint_handler = g_unix_signal_add_full (G_PRIORITY_HIGH,
+                                                        SIGINT,
+                                                        sigint_cb,
+                                                        verify_data,
+                                                        NULL);
+  fp_device_open (dev, verify_data->cancellable,
+                  (GAsyncReadyCallback) on_device_opened,
                  verify_data);

  g_main_loop_run (verify_data->loop);
--- a/libfprint/drivers/aes1610.c
+++ b/libfprint/drivers/aes1610.c
@@ -138,7 +138,7 @@ generic_read_ignore_data (FpiSsm *ssm, FpDevice *dev,
  unsigned char *data;

  data = g_malloc (bytes);
-  fpi_usb_transfer_fill_bulk_full (transfer, EP_IN, data, bytes, NULL);
+  fpi_usb_transfer_fill_bulk_full (transfer, EP_IN, data, bytes, g_free);
  transfer->ssm = ssm;
  transfer->short_is_error = TRUE;
  fpi_usb_transfer_submit (transfer, BULK_TIMEOUT, NULL,
@@ -614,6 +614,7 @@ capture_read_strip_cb (FpiUsbTransfer *transfer, FpDevice *device,
      self->strips = g_slist_reverse (self->strips);
      fpi_do_movement_estimation (&assembling_ctx, self->strips);
      img = fpi_assemble_frames (&assembling_ctx, self->strips);
+      img->flags |= FPI_IMAGE_PARTIAL;

      g_slist_free_full (self->strips, g_free);
      self->strips = NULL;
--- a/libfprint/drivers/aes2501.c
+++ b/libfprint/drivers/aes2501.c
@@ -458,6 +458,7 @@ capture_read_strip_cb (FpiUsbTransfer *transfer, FpDevice *_dev,
          fpi_do_movement_estimation (&assembling_ctx, self->strips);
          img = fpi_assemble_frames (&assembling_ctx,
                                     self->strips);
+          img->flags |= FPI_IMAGE_PARTIAL;
          g_slist_free_full (self->strips, g_free);
          self->strips = NULL;
          self->strips_len = 0;
--- a/libfprint/drivers/aes2550.c
+++ b/libfprint/drivers/aes2550.c
@@ -230,6 +230,7 @@ capture_set_idle_reqs_cb (FpiUsbTransfer *transfer,

      self->strips = g_slist_reverse (self->strips);
      img = fpi_assemble_frames (&assembling_ctx, self->strips);
+      img->flags |= FPI_IMAGE_PARTIAL;
      g_slist_free_full (self->strips, g_free);
      self->strips = NULL;
      self->strips_len = 0;
--- a/libfprint/drivers/aesx660.c
+++ b/libfprint/drivers/aesx660.c
@@ -331,6 +331,7 @@ capture_set_idle_cmd_cb (FpiUsbTransfer *transfer, FpDevice *device,

      priv->strips = g_slist_reverse (priv->strips);
      img = fpi_assemble_frames (cls->assembling_ctx, priv->strips);
+      img->flags |= FPI_IMAGE_PARTIAL;
      g_slist_foreach (priv->strips, (GFunc) g_free, NULL);
      g_slist_free (priv->strips);
      priv->strips = NULL;
--- a/libfprint/drivers/elan.c
+++ b/libfprint/drivers/elan.c
@@ -207,6 +207,7 @@ elan_save_img_frame (FpiDeviceElan *elandev)

  unsigned int frame_size = elandev->frame_width * elandev->frame_height;
  unsigned short *frame = g_malloc (frame_size * sizeof (short));
+
  elan_save_frame (elandev, frame);
  unsigned int sum = 0;

@@ -244,6 +245,7 @@ elan_process_frame_linear (unsigned short *raw_frame,
  G_DEBUG_HERE ();

  unsigned short min = 0xffff, max = 0;
+
  for (int i = 0; i < frame_size; i++)
    {
      if (raw_frame[i] < min)
@@ -255,6 +257,7 @@ elan_process_frame_linear (unsigned short *raw_frame,
  g_assert (max != min);

  unsigned short px;
+
  for (int i = 0; i < frame_size; i++)
    {
      px = raw_frame[i];
@@ -278,6 +281,7 @@ elan_process_frame_thirds (unsigned short *raw_frame,

  unsigned short lvl0, lvl1, lvl2, lvl3;
  unsigned short *sorted = g_malloc (frame_size * sizeof (short));
+
  memcpy (sorted, raw_frame, frame_size * sizeof (short));
  qsort (sorted, frame_size, sizeof (short), cmp_short);
  lvl0 = sorted[0];
@@ -287,6 +291,7 @@ elan_process_frame_thirds (unsigned short *raw_frame,
  g_free (sorted);

  unsigned short px;
+
  for (int i = 0; i < frame_size; i++)
    {
      px = raw_frame[i];
@@ -320,6 +325,7 @@ elan_submit_image (FpImageDevice *dev)
  g_slist_foreach (raw_frames, (GFunc) self->process_frame, &frames);
  fpi_do_movement_estimation (&assembling_ctx, frames);
  img = fpi_assemble_frames (&assembling_ctx, frames);
+  img->flags |= FPI_IMAGE_PARTIAL;

  g_slist_free_full (frames, g_free);

@@ -509,6 +515,7 @@ elan_stop_capture (FpDevice *dev)

  FpiSsm *ssm =
    fpi_ssm_new (dev, stop_capture_run_state, STOP_CAPTURE_NUM_STATES);
+
  fpi_ssm_start (ssm, stop_capture_complete);
 }

@@ -619,6 +626,7 @@ elan_capture (FpDevice *dev)
  elan_dev_reset_state (self);
  FpiSsm *ssm =
    fpi_ssm_new (dev, capture_run_state, CAPTURE_NUM_STATES);
+
  fpi_ssm_start (ssm, capture_complete);
 }

@@ -733,7 +741,7 @@ calibrate_run_state (FpiSsm *ssm, FpDevice *dev)
          fp_dbg ("calibration failed");
          fpi_ssm_mark_failed (ssm,
                               fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
-                                                         "Callibration failed!"));
+                                                         "Calibration failed!"));
        }
      break;

@@ -797,6 +805,7 @@ elan_calibrate (FpDevice *dev)

  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (dev), calibrate_run_state,
                             CALIBRATE_NUM_STATES);
+
  fpi_ssm_start (ssm, calibrate_complete);
 }

@@ -892,6 +901,7 @@ elan_activate (FpImageDevice *dev)
  FpiSsm *ssm =
    fpi_ssm_new (FP_DEVICE (dev), activate_run_state,
                 ACTIVATE_NUM_STATES);
+
  fpi_ssm_start (ssm, activate_complete);
 }

@@ -988,7 +998,7 @@ static void
 elan_change_state_async (FpDevice *dev,
                         void     *data)
 {
-  g_message ("state change dev: %p", dev);
+  fp_dbg ("state change dev: %p", dev);
  elan_change_state (FP_IMAGE_DEVICE (dev));
 }

--- a/libfprint/drivers/etes603.c
+++ b/libfprint/drivers/etes603.c
@@ -859,21 +859,29 @@ m_capture_state (FpiSsm *ssm, FpDevice *dev)
        }
      else
        {
-          FpImage *img;
-          unsigned int img_size;
          /* Remove empty parts 2 times for the 2 frames */
          process_removefpi_end (self);
          process_removefpi_end (self);
-          img_size = self->fp_height * FE_WIDTH;
-          img = fp_image_new (FE_WIDTH, self->fp_height);
-          /* Images received are white on black, so invert it. */
-          /* TODO detect sweep direction */
-          img->flags = FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_V_FLIPPED;
-          img->height = self->fp_height;
-          process_4to8_bpp (self->fp, img_size / 2, img->data);
-          fp_dbg ("Sending the raw fingerprint image (%dx%d)",
-                  img->width, img->height);
-          fpi_image_device_image_captured (idev, img);
+
+          if (self->fp_height >= FE_WIDTH)
+            {
+              FpImage *img = fp_image_new (FE_WIDTH, self->fp_height);
+              unsigned int img_size = self->fp_height * FE_WIDTH;
+
+              /* Images received are white on black, so invert it. */
+              /* TODO detect sweep direction */
+              img->flags = FPI_IMAGE_COLORS_INVERTED | FPI_IMAGE_V_FLIPPED;
+              img->height = self->fp_height;
+              process_4to8_bpp (self->fp, img_size / 2, img->data);
+              fp_dbg ("Sending the raw fingerprint image (%dx%d)",
+                      img->width, img->height);
+              fpi_image_device_image_captured (idev, img);
+            }
+          else
+            {
+              fpi_image_device_retry_scan (idev, FP_DEVICE_RETRY_TOO_SHORT);
+            }
+
          fpi_image_device_report_finger_status (idev, FALSE);
          fpi_ssm_mark_completed (ssm);
        }
--- a/libfprint/drivers/synaptics/bmkt_message.c
+++ b/libfprint/drivers/synaptics/bmkt_message.c
@@ -206,6 +206,7 @@ parse_get_enrolled_users_report (bmkt_msg_resp_t *msg_resp, bmkt_response_t *res
  get_enroll_templates_resp->query_sequence = extract8 (msg_resp->payload, &offset);

  int n = 0;
+
  for (n = 0; n < BMKT_MAX_NUM_TEMPLATES_INTERNAL_FLASH; n++)
    {
      if (offset >= msg_resp->payload_len)
--- a/libfprint/drivers/synaptics/bmkt_response.h
+++ b/libfprint/drivers/synaptics/bmkt_response.h
@@ -316,7 +316,7 @@ typedef struct bmkt_init_resp
 */
 typedef struct bmkt_enroll_resp
 {
-  int     progress;                             /**< Shows current progress stutus [0-100] */
+  int     progress;                             /**< Shows current progress status [0-100] */
  uint8_t finger_id;                            /**< User's finger id [1-10] */
  uint8_t user_id[BMKT_MAX_USER_ID_LEN];        /**< User name to be enrolled */
 } bmkt_enroll_resp_t;
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@@ -35,7 +35,7 @@ static const FpIdEntry id_table[] = {


 static void
-cmd_recieve_cb (FpiUsbTransfer *transfer,
+cmd_receive_cb (FpiUsbTransfer *transfer,
                FpDevice       *device,
                gpointer        user_data,
                GError         *error)
@@ -234,7 +234,7 @@ synaptics_cmd_run_state (FpiSsm   *ssm,
      fpi_usb_transfer_submit (transfer,
                               5000,
                               NULL,
-                               cmd_recieve_cb,
+                               cmd_receive_cb,
                               fpi_ssm_get_data (ssm));

      break;
@@ -321,7 +321,7 @@ synaptics_sensor_cmd (FpiDeviceSynaptics *self,
  g_assert (payload || payload_len == 0);

  /* seq_num of 0 means a normal command, -1 means the current commands
-   * sequence number should not be udpated (i.e. second async command which
+   * sequence number should not be updated (i.e. second async command which
   * may only be a cancellation currently). */
  if (seq_num <= 0)
    {
@@ -515,39 +515,7 @@ list_msg_cb (FpiDeviceSynaptics *self,
          g_object_set (print, "fpi-data", data, NULL);
          g_object_set (print, "description", get_enroll_templates_resp->templates[n].user_id, NULL);

-          /* The format has 24 bytes at the start and some dashes in the right places */
-          if (g_str_has_prefix (userid, "FP1-") && strlen (userid) >= 24 &&
-              userid[12] == '-' && userid[14] == '-' && userid[23] == '-')
-            {
-              g_autofree gchar *copy = g_strdup (userid);
-              g_autoptr(GDate) date = NULL;
-              gint32 date_ymd;
-              gint32 finger;
-              gchar *username;
-              /* Try to parse information from the string. */
-
-              copy[12] = '\0';
-              date_ymd = g_ascii_strtod (copy + 4, NULL);
-              if (date_ymd > 0)
-                date = g_date_new_dmy (date_ymd % 100,
-                                       (date_ymd / 100) % 100,
-                                       date_ymd / 10000);
-              else
-                date = g_date_new ();
-
-              fp_print_set_enroll_date (print, date);
-
-              copy[14] = '\0';
-              finger = g_ascii_strtoll (copy + 13, NULL, 16);
-              fp_print_set_finger (print, finger);
-
-              /* We ignore the next chunk, it is just random data.
-               * Then comes the username; nobody is the default if the metadata
-               * is unknown */
-              username = copy + 24;
-              if (strlen (username) > 0 && g_strcmp0 (username, "nobody") != 0)
-                fp_print_set_username (print, username);
-            }
+          fpi_print_fill_from_user_id (print, userid);

          g_ptr_array_add (self->list_result, g_object_ref_sink (print));
        }
@@ -635,7 +603,7 @@ verify_msg_cb (FpiDeviceSynaptics *self,
      else if (resp->result == BMKT_FP_NO_MATCH)
        {
          fp_info ("Print didn't match");
-          fpi_device_verify_report (device, FPI_MATCH_FAIL, NULL, error);
+          fpi_device_verify_report (device, FPI_MATCH_FAIL, NULL, NULL);
          verify_complete_after_finger_removal (self);
        }
      else if (resp->result == BMKT_FP_DATABASE_NO_RECORD_EXISTS)
@@ -730,7 +698,7 @@ enroll_msg_cb (FpiDeviceSynaptics *self,
        if (enroll_resp->progress < 100)
          done_stages = MIN (done_stages, ENROLL_SAMPLES - 1);

-        /* Emit a retry error if there has been no discernable
+        /* Emit a retry error if there has been no discernible
         * progress. Some firmware revisions report more required
         * touches. */
        if (self->enroll_stage == done_stages)
@@ -795,8 +763,6 @@ enroll_msg_cb (FpiDeviceSynaptics *self,
    }
 }

-#define TEMPLATE_ID_SIZE 20
-
 static void
 enroll (FpDevice *device)
 {
@@ -804,52 +770,21 @@ enroll (FpDevice *device)
  FpPrint *print = NULL;
  GVariant *data = NULL;
  GVariant *uid = NULL;
-  const gchar *username;
  guint finger;
  g_autofree gchar *user_id = NULL;
  gssize user_id_len;
  g_autofree guint8 *payload = NULL;
-  const GDate *date;
-  gint y, m, d;
-  gint32 rand_id = 0;

  fpi_device_get_enroll_data (device, &print);

  G_DEBUG_HERE ();

-  date = fp_print_get_enroll_date (print);
-  if (date && g_date_valid (date))
-    {
-      y = g_date_get_year (date);
-      m = g_date_get_month (date);
-      d = g_date_get_day (date);
-    }
-  else
-    {
-      y = 0;
-      m = 0;
-      d = 0;
-    }
-
-  username = fp_print_get_username (print);
-  if (!username)
-    username = "nobody";
-
-  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
-    rand_id = 0;
-  else
-    rand_id = g_random_int ();
-
-  user_id = g_strdup_printf ("FP1-%04d%02d%02d-%X-%08X-%s",
-                             y, m, d,
-                             fp_print_get_finger (print),
-                             rand_id,
-                             username);
+  user_id = fpi_print_generate_user_id (print);

  user_id_len = strlen (user_id);
  user_id_len = MIN (BMKT_MAX_USER_ID_LEN, user_id_len);

-  /* We currently always use finger 1 from the devices piont of view */
+  /* We currently always use finger 1 from the devices point of view */
  finger = 1;

  uid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
@@ -1029,7 +964,7 @@ dev_probe (FpDevice *device)

  if (!read_ok)
    {
-      g_warning ("Transfer in response to verison query was too short");
+      g_warning ("Transfer in response to version query was too short");
      error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO);
      goto err_close;
    }
--- a/libfprint/drivers/upektc_img.c
+++ b/libfprint/drivers/upektc_img.c
@@ -310,6 +310,7 @@ capture_read_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
          fp_dbg ("Image size is %lu\n",
                  self->image_size);
          img = fp_image_new (IMAGE_WIDTH, IMAGE_HEIGHT);
+          img->flags |= FPI_IMAGE_PARTIAL;
          memcpy (img->data, self->image_bits,
                  IMAGE_SIZE);
          fpi_image_device_image_captured (dev, img);
--- a/libfprint/drivers/upekts.c
+++ b/libfprint/drivers/upekts.c
@@ -35,7 +35,6 @@
 #define TIMEOUT 5000

 #define MSG_READ_BUF_SIZE 0x40
-#define MAX_DATA_IN_READ_BUF (MSG_READ_BUF_SIZE - 9)

 struct _FpiDeviceUpekts
 {
@@ -236,12 +235,18 @@ __handle_incoming_msg (FpDevice             *device,
 {
  GError *error = NULL;
  guint8 *buf = udata->buffer;
-  guint16 len = ((buf[5] & 0xf) << 8) | buf[6];
-  guint16 computed_crc = udf_crc (buf + 4, len + 3);
-  guint16 msg_crc = (buf[len + 8] << 8) | buf[len + 7];
-  unsigned char *retdata = NULL;
+  guint16 len;
+  guint16 computed_crc;
+  guint16 msg_crc;
  unsigned char code_a, code_b;

+  g_assert (udata->buflen >= 6);
+  len = ((buf[5] & 0xf) << 8) | buf[6];
+
+  g_assert (udata->buflen >= len + 9);
+  computed_crc = udf_crc (buf + 4, len + 3);
+  msg_crc = (buf[len + 8] << 8) | buf[len + 7];
+
  if (computed_crc != msg_crc)
    {
      fp_err ("CRC failed, got %04x expected %04x", msg_crc, computed_crc);
@@ -267,12 +272,7 @@ __handle_incoming_msg (FpDevice             *device,
          return;
        }

-      if (len > 0)
-        {
-          retdata = g_malloc (len);
-          memcpy (retdata, buf + 7, len);
-        }
-      udata->callback (device, READ_MSG_CMD, code_a, 0, retdata, len,
+      udata->callback (device, READ_MSG_CMD, code_a, 0, buf + 7, len,
                       udata->user_data, NULL);
      goto done;
    }
@@ -309,14 +309,8 @@ __handle_incoming_msg (FpDevice             *device,
      innerlen = innerlen - 3;
      _subcmd = innerbuf[5];
      fp_dbg ("device responds to subcmd %x with %d bytes", _subcmd, innerlen);
-      if (innerlen > 0)
-        {
-          retdata = g_malloc (innerlen);
-          memcpy (retdata, innerbuf + 6, innerlen);
-        }
      udata->callback (device, READ_MSG_RESPONSE, code_b, _subcmd,
-                       retdata, innerlen, udata->user_data, NULL);
-      g_free (retdata);
+                       innerbuf + 6, innerlen, udata->user_data, NULL);
      goto done;
    }
  else
@@ -358,7 +352,8 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
             gpointer user_data, GError *error)
 {
  struct read_msg_data *udata = user_data;
-  guint16 len;
+  guint16 payload_len;
+  gsize packet_len;

  if (error)
    {
@@ -383,14 +378,15 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
      goto err;
    }

-  len = ((udata->buffer[5] & 0xf) << 8) | udata->buffer[6];
+  payload_len = ((udata->buffer[5] & 0xf) << 8) | udata->buffer[6];
+  packet_len = payload_len + 9;
  if (transfer->actual_length != MSG_READ_BUF_SIZE &&
-      (len + 9) > transfer->actual_length)
+      packet_len > transfer->actual_length)
    {
      /* Check that the length claimed inside the message is in line with
       * the amount of data that was transferred over USB. */
      fp_err ("msg didn't include enough data, expected=%d recv=%d",
-              len + 9, (gint) transfer->actual_length);
+              (gint) packet_len, (gint) transfer->actual_length);
      error = fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
                                        "Packet from device didn't include data");
      goto err;
@@ -399,14 +395,14 @@ read_msg_cb (FpiUsbTransfer *transfer, FpDevice *device,
  /* We use a 64 byte buffer for reading messages. However, sometimes
   * messages are longer, in which case we have to do another USB bulk read
   * to read the remainder. This is handled below. */
-  if (len > MAX_DATA_IN_READ_BUF)
+  if (packet_len > MSG_READ_BUF_SIZE)
    {
-      int needed = len - MAX_DATA_IN_READ_BUF;
+      int needed = packet_len - MSG_READ_BUF_SIZE;
      FpiUsbTransfer *etransfer = fpi_usb_transfer_new (device);

      fp_dbg ("didn't fit in buffer, need to extend by %d bytes", needed);
-      udata->buffer = g_realloc ((gpointer) udata->buffer, len);
-      udata->buflen = len;
+      udata->buffer = g_realloc ((gpointer) udata->buffer, packet_len);
+      udata->buflen = packet_len;

      fpi_usb_transfer_fill_bulk_full (etransfer, EP_IN,
                                       udata->buffer + MSG_READ_BUF_SIZE,
@@ -700,7 +696,7 @@ initsm_run_state (FpiSsm *ssm, FpDevice *dev)
      break;

    case SEND_RESP03:;
-      transfer = alloc_send_cmd28_transfer (dev, ++upekdev->seq, init_resp03, sizeof (init_resp03));
+      transfer = alloc_send_cmdresponse_transfer (dev, ++upekdev->seq, init_resp03, sizeof (init_resp03));
      transfer->ssm = ssm;
      transfer->short_is_error = TRUE;
      fpi_usb_transfer_submit (transfer, TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
@@ -856,21 +852,14 @@ dev_init (FpDevice *dev)
  fpi_ssm_start (ssm, initsm_done);
 }

-static void
-deinitsm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
-{
-  g_usb_device_release_interface (fpi_device_get_usb_device (dev), 0, 0, NULL);
-
-  fpi_device_close_complete (dev, error);
-}
-
 static void
 dev_exit (FpDevice *dev)
 {
-  FpiSsm *ssm;
+  GError *error = NULL;

-  ssm = fpi_ssm_new (dev, deinitsm_state_handler, DEINITSM_NUM_STATES);
-  fpi_ssm_start (ssm, deinitsm_done);
+  g_usb_device_release_interface (fpi_device_get_usb_device (dev), 0, 0, &error);
+
+  fpi_device_close_complete (dev, error);
 }

 static const unsigned char enroll_init[] = {
@@ -983,7 +972,9 @@ enroll_stop_deinit_cb (FpiSsm *ssm, FpDevice *dev, GError *error)
  if (error)
    fp_warn ("Error deinitializing: %s", error->message);

-  fpi_device_enroll_complete (dev, data->print, data->error);
+  fpi_device_enroll_complete (dev,
+                              g_steal_pointer (&data->print),
+                              g_steal_pointer (&data->error));
 }

 static void
@@ -992,7 +983,7 @@ do_enroll_stop (FpDevice *dev, FpPrint *print, GError *error)
  EnrollStopData *data = g_new0 (EnrollStopData, 1);
  FpiSsm *ssm = deinitsm_new (dev, data);

-  data->print = g_object_ref (print);
+  data->print = print;
  data->error = error;

  fpi_ssm_start (ssm, enroll_stop_deinit_cb);
@@ -1119,7 +1110,6 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data,
  else
    {
      GVariant *fp_data;
-      print = fp_print_new (dev);

      fpi_device_get_enroll_data (dev, &print);

@@ -1128,6 +1118,7 @@ e_handle_resp02 (FpDevice *dev, unsigned char *data,
                                           data_len - sizeof (scan_comp),
                                           1);

+      fpi_print_set_type (print, FPI_PRINT_RAW);
      g_object_set (print, "fpi-data", fp_data, NULL);
      g_object_ref (print);
    }
@@ -1246,11 +1237,11 @@ verify_stop_deinit_cb (FpiSsm *ssm, FpDevice *dev, GError *error)
    fp_warn ("Error deinitializing: %s", error->message);

  if (data->error)
-    fpi_device_verify_complete (dev, data->error);
+    fpi_device_verify_complete (dev, g_steal_pointer (&data->error));
  else
    fpi_device_verify_complete (dev, g_steal_pointer (&error));

-  g_error_free (error);
+  g_clear_error (&error);
 }

 static void
@@ -1260,7 +1251,7 @@ do_verify_stop (FpDevice *dev, FpiMatchResult res, GError *error)
  FpiSsm *ssm = deinitsm_new (dev, data);

  /* Report the error immediately if possible, otherwise delay it. */
-  if (!error && error->domain != FP_DEVICE_RETRY)
+  if (error && error->domain == FP_DEVICE_RETRY)
    fpi_device_verify_report (dev, res, NULL, error);
  else
    data->error = error;
@@ -1302,7 +1293,7 @@ verify_start_sm_run_state (FpiSsm *ssm, FpDevice *dev)

    case VERIFY_INIT:
      fpi_device_get_verify_data (dev, &print);
-      g_object_get (dev, "fpi-data", &fp_data, NULL);
+      g_object_get (print, "fpi-data", &fp_data, NULL);

      data = g_variant_get_fixed_array (fp_data, &data_len, 1);

--- a/libfprint/drivers/vfs0050.c
+++ b/libfprint/drivers/vfs0050.c
@@ -119,7 +119,7 @@ async_abort_callback (FpiUsbTransfer *transfer, FpDevice *device,
  /* In normal case endpoint is empty */
  if (g_error_matches (error, G_USB_DEVICE_ERROR, G_USB_DEVICE_ERROR_TIMED_OUT))
    {
-      g_free (error);
+      g_error_free (error);
      fpi_ssm_next_state (transfer->ssm);
      return;
    }
@@ -156,6 +156,8 @@ async_abort (FpDevice *dev, FpiSsm *ssm, int ep)
  else
    fpi_usb_transfer_fill_bulk (transfer, ep, VFS_USB_BUFFER_SIZE);

+  transfer->ssm = ssm;
+
  fpi_usb_transfer_submit (transfer, VFS_USB_ABORT_TIMEOUT, NULL,
                           async_abort_callback, NULL);
 }
@@ -240,6 +242,7 @@ prepare_image (FpDeviceVfs0050 *vdev)

  /* Building GSList */
  GSList *lines = NULL;
+
  for (int i = height - 1; i >= 0; --i)
    lines = g_slist_prepend (lines, vdev->lines_buffer + i);

@@ -464,8 +467,8 @@ receive_callback (FpiUsbTransfer *transfer, FpDevice *device,
  if (error)
    g_error_free (error);

-  /* Check if fingerprint data is over */
-  if (transfer->actual_length == 0)
+  /* Capture is done when there is no more data to transfer or device timed out */
+  if (transfer->actual_length <= 0)
    {
      fpi_ssm_next_state (transfer->ssm);
    }
@@ -473,7 +476,7 @@ receive_callback (FpiUsbTransfer *transfer, FpDevice *device,
    {
      self->bytes += transfer->actual_length;

-      /* We need more data */
+      /* Try reading more data */
      fpi_ssm_jump_to_state (transfer->ssm,
                             fpi_ssm_get_cur_state (transfer->ssm));
    }
@@ -595,8 +598,7 @@ activate_ssm (FpiSsm *ssm, FpDevice *dev)
        /* Receive chunk of data */
        transfer = fpi_usb_transfer_new (dev);
        fpi_usb_transfer_fill_bulk_full (transfer, 0x82,
-                                         (guint8 *)
-                                         (self->lines_buffer + self->bytes),
+                                         (guint8 *) self->lines_buffer + self->bytes,
                                         VFS_USB_BUFFER_SIZE, NULL);
        transfer->ssm = ssm;
        fpi_usb_transfer_submit (transfer, VFS_USB_TIMEOUT, NULL,
@@ -668,6 +670,7 @@ dev_activate (FpImageDevice *idev)
  self->ssm_active = 1;

  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (idev), activate_ssm, SSM_STATES);
+
  fpi_ssm_start (ssm, dev_activate_callback);
 }

@@ -711,6 +714,7 @@ dev_open (FpImageDevice *idev)

  /* Clearing previous device state */
  FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (idev), activate_ssm, SSM_STATES);
+
  fpi_ssm_start (ssm, dev_open_callback);
 }

--- a/libfprint/drivers/vfs301_proto.c
+++ b/libfprint/drivers/vfs301_proto.c
@@ -177,6 +177,7 @@ translate_str (const char **srcL, gssize *len)
      src_len += tmp;
    }

+  g_assert (src_len >= 2);
  *len = src_len / 2;
  res = g_malloc0 (*len);
  dst = res;
--- a/libfprint/drivers/vfs5011.c
+++ b/libfprint/drivers/vfs5011.c
@@ -381,9 +381,8 @@ submit_image (FpiSsm          *ssm,
 {
  FpImage *img;

-  if (self->lines_recorded == 0)
+  if (self->lines_recorded < VFS5011_IMAGE_WIDTH)
    {
-      /* == FP_ENROLL_RETRY_TOO_SHORT */
      fpi_image_device_retry_scan (dev, FP_DEVICE_RETRY_TOO_SHORT);
      return;
    }
--- a/libfprint/drivers/virtual-image.c
+++ b/libfprint/drivers/virtual-image.c
@@ -21,7 +21,7 @@
 /*
 * This is a virtual driver to debug the image based drivers. A small
 * python script is provided to connect to it via a socket, allowing
- * prints to be sent to this device programatically.
+ * prints to be sent to this device programmatically.
 * Using this it is possible to test libfprint and fprintd.
 */

@@ -252,6 +252,7 @@ dev_init (FpImageDevice *dev)
  g_autoptr(GSocketListener) listener = NULL;
  FpDeviceVirtualImage *self = FPI_DEVICE_VIRTUAL_IMAGE (dev);
  const char *env;
+
  g_autoptr(GSocketAddress) addr = NULL;
  G_DEBUG_HERE ();

--- a/libfprint/fp-context.c
+++ b/libfprint/fp-context.c
@@ -94,22 +94,21 @@ async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer u
  FpContext *context;
  FpContextPrivate *priv;

-  device = (FpDevice *) g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, &error);
-  if (!device)
-    {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        return;
-
-      context = FP_CONTEXT (user_data);
-      priv = fp_context_get_instance_private (context);
-      priv->pending_devices--;
-      g_message ("Ignoring device due to initialization error: %s", error->message);
-      return;
-    }
+  device = FP_DEVICE (g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
+                                                   res, &error));
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+    return;

  context = FP_CONTEXT (user_data);
  priv = fp_context_get_instance_private (context);
  priv->pending_devices--;
+
+  if (error)
+    {
+      g_message ("Ignoring device due to initialization error: %s", error->message);
+      return;
+    }
+
  g_ptr_array_add (priv->devices, device);
  g_signal_emit (context, signals[DEVICE_ADDED_SIGNAL], 0, device);
 }
@@ -159,7 +158,7 @@ usb_device_added_cb (FpContext *self, GUsbDevice *device, GUsbContext *usb_ctx)

  if (found_driver == G_TYPE_NONE)
    {
-      g_debug ("No driver found for USB device %04X:%04X", pid, vid);
+      g_debug ("No driver found for USB device %04X:%04X", vid, pid);
      return;
    }

--- a/libfprint/fp-device.c
+++ b/libfprint/fp-device.c
@@ -24,16 +24,11 @@
 #include "fp-device-private.h"

 /**
- * SECTION: fpi-device
- * @title: Internal FpDevice
- * @short_description: Internal device routines
+ * SECTION: fp-device
+ * @title: FpDevice
+ * @short_description: Fingerpint device routines
 *
- * The methods that are availabe for drivers to manipulate a device. See
- * #FpDeviceClass for more information. Also note that most of these are
- * not relevant for image based devices, see #FpImageDeviceClass in that
- * case.
- *
- * Also see the public #FpDevice routines.
+ * These are the public #FpDevice routines.
 */

 static void fp_device_async_initable_iface_init (GAsyncInitableIface *iface);
@@ -339,7 +334,7 @@ fp_device_class_init (FpDeviceClass *klass)
  properties[PROP_OPEN] =
    g_param_spec_boolean ("open",
                          "Opened",
-                          "Wether the device is open or not", FALSE,
+                          "Whether the device is open or not", FALSE,
                          G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);

  /**
--- a/libfprint/fp-device.h
+++ b/libfprint/fp-device.h
@@ -79,7 +79,7 @@ typedef enum {

 /**
 * FpDeviceError:
- * @FP_DEVICE_ERROR_GENERAL: A general error occured.
+ * @FP_DEVICE_ERROR_GENERAL: A general error occurred.
 * @FP_DEVICE_ERROR_NOT_SUPPORTED: The device does not support the requested
 *  operation.
 * @FP_DEVICE_ERROR_NOT_OPEN: The device needs to be opened to start this
@@ -113,7 +113,7 @@ GQuark fp_device_error_quark (void);
 * FpEnrollProgress:
 * @device: a #FpDevice
 * @completed_stages: Number of completed stages
- * @print: (nullable) (transfer none): The last scaned print
+ * @print: (nullable) (transfer none): The last scanned print
 * @user_data: (nullable) (transfer none): User provided data
 * @error: (nullable) (transfer none): #GError or %NULL
 *
--- a/libfprint/fp-image-device.c
+++ b/libfprint/fp-image-device.c
@@ -100,7 +100,7 @@ fp_image_device_close (FpDevice *device)
   *  1. We are inactive
   *     -> immediately close
   *  2. We are waiting for finger off
-   *     -> imediately deactivate
+   *     -> immediately deactivate
   *  3. We are deactivating
   *     -> handled by deactivate_complete */

--- a/libfprint/fp-image.c
+++ b/libfprint/fp-image.c
@@ -184,10 +184,8 @@ fp_image_detect_minutiae_cb (GObject      *source_object,
  GTask *task = G_TASK (res);
  FpImage *image;
  DetectMinutiaeData *data = g_task_get_task_data (task);
-  GCancellable *cancellable;

-  cancellable = g_task_get_cancellable (task);
-  if (!cancellable || !g_cancellable_is_cancelled (cancellable))
+  if (!g_task_had_error (task))
    {
      gint i;
      image = FP_IMAGE (source_object);
@@ -283,6 +281,7 @@ fp_image_detect_minutiae_thread_func (GTask        *task,
  gint map_w, map_h;
  gint bw, bh, bd;
  gint r;
+  g_autofree LFSPARMS *lfsparms;

  /* Normalize the image first */
  if (data->flags & FPI_IMAGE_H_FLIPPED)
@@ -296,12 +295,15 @@ fp_image_detect_minutiae_thread_func (GTask        *task,

  data->flags &= ~(FPI_IMAGE_H_FLIPPED | FPI_IMAGE_V_FLIPPED | FPI_IMAGE_COLORS_INVERTED);

+  lfsparms = g_memdup (&g_lfsparms_V2, sizeof (LFSPARMS));
+  lfsparms->remove_perimeter_pts = data->flags & FPI_IMAGE_PARTIAL ? TRUE : FALSE;
+
  timer = g_timer_new ();
  r = get_minutiae (&minutiae, &quality_map, &direction_map,
                    &low_contrast_map, &low_flow_map, &high_curve_map,
                    &map_w, &map_h, &bdata, &bw, &bh, &bd,
                    data->image, data->width, data->height, 8,
-                    data->ppmm, &g_lfsparms_V2);
+                    data->ppmm, lfsparms);
  g_timer_stop (timer);
  fp_dbg ("Minutiae scan completed in %f secs", g_timer_elapsed (timer, NULL));

@@ -316,6 +318,14 @@ fp_image_detect_minutiae_thread_func (GTask        *task,
      return;
    }

+  if (!data->minutiae || data->minutiae->num == 0)
+    {
+      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
+                               "No minutiae found");
+      g_object_unref (task);
+      return;
+    }
+
  g_task_return_boolean (task, TRUE);
  g_object_unref (task);
 }
--- a/libfprint/fp-print.c
+++ b/libfprint/fp-print.c
@@ -51,7 +51,7 @@ enum {
  PROP_IMAGE,

  /* The following is metadata that is stored by default for each print.
-   * Drivers may make use of these during enrollment (e.g. to additionaly store
+   * Drivers may make use of these during enrollment (e.g. to additionally store
   * the metadata on the device). */
  PROP_FINGER,
  PROP_USERNAME,
@@ -588,7 +588,7 @@ fp_print_equal (FpPrint *self, FpPrint *other)
    }
  else if (self->type == FPI_PRINT_NBIS)
    {
-      gint i;
+      guint i;

      if (self->prints->len != other->prints->len)
        return FALSE;
@@ -661,7 +661,7 @@ fp_print_serialize (FpPrint *print,
  if (print->type == FPI_PRINT_NBIS)
    {
      GVariantBuilder nested = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("(a(aiaiai))"));
-      gint i;
+      guint i;

      g_variant_builder_open (&nested, G_VARIANT_TYPE ("a(aiaiai)"));
      for (i = 0; i < print->prints->len; i++)
@@ -812,7 +812,7 @@ fp_print_deserialize (const guchar *data,
  if (type == FPI_PRINT_NBIS)
    {
      g_autoptr(GVariant) prints = g_variant_get_child_value (print_data, 0);
-      gint i;
+      guint i;

      result = g_object_new (FP_TYPE_PRINT,
                             "driver", driver,
@@ -822,7 +822,7 @@ fp_print_deserialize (const guchar *data,
      fpi_print_set_type (result, FPI_PRINT_NBIS);
      for (i = 0; i < g_variant_n_children (prints); i++)
        {
-          g_autofree struct xyt_struct *xyt = g_new0 (struct xyt_struct, 1);
+          g_autofree struct xyt_struct *xyt = NULL;
          const gint32 *xcol, *ycol, *thetacol;
          gsize xlen, ylen, thetalen;
          g_autoptr(GVariant) xyt_data = NULL;
@@ -848,6 +848,7 @@ fp_print_deserialize (const guchar *data,
          if (xlen > G_N_ELEMENTS (xyt->xcol))
            goto invalid_format;

+          xyt = g_new0 (struct xyt_struct, 1);
          xyt->nrows = xlen;
          memcpy (xyt->xcol, xcol, sizeof (xcol[0]) * xlen);
          memcpy (xyt->ycol, ycol, sizeof (xcol[0]) * xlen);
--- a/libfprint/fpi-device.c
+++ b/libfprint/fpi-device.c
@@ -28,7 +28,7 @@
 * @title: Internal FpDevice
 * @short_description: Internal device routines
 *
- * The methods that are availabe for drivers to manipulate a device. See
+ * The methods that are available for drivers to manipulate a device. See
 * #FpDeviceClass for more information. Also note that most of these are
 * not relevant for image based devices, see #FpImageDeviceClass in that
 * case.
@@ -100,7 +100,7 @@ fpi_device_error_new (FpDeviceError error)
  switch (error)
    {
    case FP_DEVICE_ERROR_GENERAL:
-      msg = "An unspecified error occured!";
+      msg = "An unspecified error occurred!";
      break;

    case FP_DEVICE_ERROR_NOT_SUPPORTED:
@@ -138,7 +138,7 @@ fpi_device_error_new (FpDeviceError error)
    default:
      g_warning ("Unsupported error, returning general error instead!");
      error = FP_DEVICE_ERROR_GENERAL;
-      msg = "An unspecified error occured!";
+      msg = "An unspecified error occurred!";
    }

  return g_error_new_literal (FP_DEVICE_ERROR, error, msg);
@@ -912,6 +912,20 @@ fpi_device_enroll_complete (FpDevice *device, FpPrint *print, GError *error)
    {
      if (FP_IS_PRINT (print))
        {
+          FpiPrintType print_type;
+
+          g_object_get (print, "fpi-type", &print_type, NULL);
+          if (print_type == FPI_PRINT_UNDEFINED)
+            {
+              g_warning ("Driver did not set the type on the returned print!");
+              g_clear_object (&print);
+
+              error = fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL,
+                                                "Driver provided incorrect print data!");
+              fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_ERROR, error);
+              return;
+            }
+
          fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_OBJECT, print);
        }
      else
--- a/libfprint/fpi-device.h
+++ b/libfprint/fpi-device.h
@@ -65,10 +65,10 @@ struct _FpIdEntry
 * @probe: Called immediately for all devices. Most drivers will not need to
 *   implement this. Drivers should setup the device identifier from the probe
 *   callback which will be used to verify the compatibility of stored
- *   #FpPrint's. It is permissable to temporarily open the USB device if this
+ *   #FpPrint's. It is permissible to temporarily open the USB device if this
 *   is required for the operation. If an error is returned, then the device
 *   will be destroyed again immediately and never reported to the API user.
- * @open: Open the device for futher operations. Any of the normal actions are
+ * @open: Open the device for further operations. Any of the normal actions are
 *   guaranteed to only happen when the device is open (this includes delete).
 * @close: Close the device again
 * @enroll: Start an enroll operation
--- a/libfprint/fpi-image-device.c
+++ b/libfprint/fpi-image-device.c
@@ -24,12 +24,11 @@
 #include "fp-image-device.h"

 /**
- * SECTION: fpi-image
- * @title: Internal FpImage
- * @short_description: Internal image handling routines
+ * SECTION: fpi-image-device
+ * @title: Internal FpImageDevice
+ * @short_description: Internal image device functions
 *
- * Internal image handling routines. Also see the public <ulink
- * url="libfprint-FpImage.html">FpImage routines</ulink>.
+ * Internal image device functions. See #FpImageDevice for public routines.
 */

 /* Manually redefine what G_DEFINE_* macro does */
@@ -171,7 +170,16 @@ 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))
-        g_clear_object (&print);
+        {
+          g_clear_object (&print);
+
+          if (error->domain != FP_DEVICE_RETRY)
+            {
+              fpi_device_action_error (device, error);
+              fpi_image_device_deactivate (self);
+              return;
+            }
+        }
    }

  if (action == FPI_DEVICE_ACTION_ENROLL)
--- a/libfprint/fpi-image.c
+++ b/libfprint/fpi-image.c
@@ -34,8 +34,7 @@
 * @title: Internal FpImage
 * @short_description: Internal image handling routines
 *
- * Internal image handling routines. Also see the public <ulink
- * url="libfprint-FpImage.html">FpImage routines</ulink>.
+ * Internal image handling routines. See #FpImage for public routines.
 */

 /**
--- a/libfprint/fpi-image.h
+++ b/libfprint/fpi-image.h
@@ -37,6 +37,7 @@ typedef enum {
  FPI_IMAGE_V_FLIPPED       = 1 << 0,
  FPI_IMAGE_H_FLIPPED       = 1 << 1,
  FPI_IMAGE_COLORS_INVERTED = 1 << 2,
+  FPI_IMAGE_PARTIAL         = 1 << 3,
 } FpiImageFlags;

 /**
--- a/libfprint/fpi-print.c
+++ b/libfprint/fpi-print.c
@@ -23,6 +23,7 @@

 #include "fp-print-private.h"
 #include "fpi-device.h"
+#include "fpi-compat.h"

 /**
 * SECTION: fpi-print
@@ -247,3 +248,115 @@ fpi_print_bz3_match (FpPrint *template, FpPrint *print, gint bz3_threshold, GErr

  return FPI_MATCH_FAIL;
 }
+
+/**
+ * fpi_print_generate_user_id:
+ * @print: #FpPrint to generate the ID for
+ *
+ * Generates a string identifier for the represented print. This identifier
+ * encodes some metadata about the print. It also includes a random string
+ * and may be assumed to be unique.
+ *
+ * This is useful if devices are able to store a string identifier, but more
+ * storing more metadata may be desirable. In effect, this means the driver
+ * can provide somewhat more meaningful data to fp_device_list_prints().
+ *
+ * The generated ID may be truncated after 23 characters. However, more space
+ * is required to include the username, and it is recommended to store at
+ * at least 31 bytes.
+ *
+ * The generated format may change in the future. It is versioned though and
+ * decoding should remain functional.
+ *
+ * Returns: A unique string of 23 + strlen(username) characters
+ */
+gchar *
+fpi_print_generate_user_id (FpPrint *print)
+{
+  const gchar *username = NULL;
+  gchar *user_id = NULL;
+  const GDate *date;
+  gint y = 0, m = 0, d = 0;
+  gint32 rand_id = 0;
+
+  g_assert (print);
+  date = fp_print_get_enroll_date (print);
+  if (date && g_date_valid (date))
+    {
+      y = g_date_get_year (date);
+      m = g_date_get_month (date);
+      d = g_date_get_day (date);
+    }
+
+  username = fp_print_get_username (print);
+  if (!username)
+    username = "nobody";
+
+  if (g_strcmp0 (g_getenv ("FP_DEVICE_EMULATION"), "1") == 0)
+    rand_id = 0;
+  else
+    rand_id = g_random_int ();
+
+  user_id = g_strdup_printf ("FP1-%04d%02d%02d-%X-%08X-%s",
+                             y, m, d,
+                             fp_print_get_finger (print),
+                             rand_id,
+                             username);
+
+  return user_id;
+
+}
+
+/**
+ * fpi_print_fill_from_user_id:
+ * @print: #FpPrint to fill metadata into
+ * @user_id: An ID that was likely encoded using fpi_print_generate_user_id()
+ *
+ * This is the reverse operation of fpi_print_generate_user_id(), allowing
+ * the driver to encode some print metadata in a string.
+ *
+ * Returns: Whether a valid ID was found
+ */
+gboolean
+fpi_print_fill_from_user_id (FpPrint *print, const char *user_id)
+{
+  g_return_val_if_fail (user_id, FALSE);
+
+  /* The format has 24 bytes at the start and some dashes in the right places */
+  if (g_str_has_prefix (user_id, "FP1-") && strlen (user_id) >= 24 &&
+      user_id[12] == '-' && user_id[14] == '-' && user_id[23] == '-')
+    {
+      g_autofree gchar *copy = g_strdup (user_id);
+      g_autoptr(GDate) date = NULL;
+      gint32 date_ymd;
+      gint32 finger;
+      gchar *username;
+      /* Try to parse information from the string. */
+
+      copy[12] = '\0';
+      date_ymd = g_ascii_strtod (copy + 4, NULL);
+      if (date_ymd > 0)
+        date = g_date_new_dmy (date_ymd % 100,
+                               (date_ymd / 100) % 100,
+                               date_ymd / 10000);
+      else
+        date = g_date_new ();
+
+      fp_print_set_enroll_date (print, date);
+
+      copy[14] = '\0';
+      finger = g_ascii_strtoll (copy + 13, NULL, 16);
+      fp_print_set_finger (print, finger);
+
+      /* We ignore the next chunk, it is just random data.
+       * Then comes the username; nobody is the default if the metadata
+       * is unknown */
+      username = copy + 24;
+      if (strlen (username) > 0 && g_strcmp0 (username, "nobody") != 0)
+        fp_print_set_username (print, username);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
--- a/libfprint/fpi-print.h
+++ b/libfprint/fpi-print.h
@@ -20,7 +20,7 @@ typedef enum {

 /**
 * FpiMatchResult:
- * @FPI_MATCH_ERROR: An error occured during matching
+ * @FPI_MATCH_ERROR: An error occurred during matching
 * @FPI_MATCH_FAIL: The prints did not match
 * @FPI_MATCH_SUCCESS: The prints matched
 */
@@ -47,4 +47,9 @@ FpiMatchResult fpi_print_bz3_match (FpPrint * template,
                                    gint bz3_threshold,
                                    GError **error);

+/* Helpers to encode metadata into user ID strings. */
+gchar *  fpi_print_generate_user_id (FpPrint *print);
+gboolean fpi_print_fill_from_user_id (FpPrint    *print,
+                                      const char *user_id);
+
 G_END_DECLS
--- a/libfprint/fpi-usb-transfer.c
+++ b/libfprint/fpi-usb-transfer.c
@@ -366,7 +366,7 @@ transfer_finish_cb (GObject *source_object, GAsyncResult *res, gpointer user_dat
 *
 * Note that #FpiUsbTransfer will be stolen when this function is called.
 * So that all associated data will be free'ed automatically, after the
- * callback ran unless fpi_usb_transfer_ref() is explictly called.
+ * callback ran unless fpi_usb_transfer_ref() is explicitly called.
 */
 void
 fpi_usb_transfer_submit (FpiUsbTransfer        *transfer,
--- a/libfprint/fpi-usb-transfer.h
+++ b/libfprint/fpi-usb-transfer.h
@@ -61,7 +61,7 @@ typedef enum  {
 * @length: The requested length of the transfer in bytes.
 * @actual_length: The actual length of the transfer
 *  (see also fpi_usb_transfer_set_short_error())
- * @buffer: The transfered data.
+ * @buffer: The transferred data.
 *
 * Helper for handling USB transfers.
 */
--- a/libfprint/fprint-list-supported-devices.c
+++ b/libfprint/fprint-list-supported-devices.c
@@ -2,7 +2,7 @@
 * Copyright (C) 2009 Red Hat <mjg@redhat.com>
 * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
 * Copyright (C) 2008 Timo Hoenig <thoenig@suse.de>, <thoenig@nouse.net>
- * Coypright (C) 2019 Benjamin Berg <bberg@redhat.com>
+ * Copyright (C) 2019 Benjamin Berg <bberg@redhat.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
--- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c
@@ -2,7 +2,7 @@
 * Copyright (C) 2009 Red Hat <mjg@redhat.com>
 * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
 * Copyright (C) 2008 Timo Hoenig <thoenig@suse.de>, <thoenig@nouse.net>
- * Coypright (C) 2019 Benjamin Berg <bberg@redhat.com>
+ * Copyright (C) 2019 Benjamin Berg <bberg@redhat.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -31,6 +31,7 @@ libfprint_private_headers = [
    'fpi-byte-reader.h',
    'fpi-byte-utils.h',
    'fpi-byte-writer.h',
+    'fpi-compat.h',
    'fpi-context.h',
    'fpi-device.h',
    'fpi-image-device.h',
@@ -203,6 +204,7 @@ deps = [
    enums_dep,
    gio_dep,
    glib_dep,
+    gobject_dep,
    gusb_dep,
    imaging_dep,
    mathlib_dep,
@@ -258,7 +260,7 @@ libfprint = library(versioned_libname.split('lib')[1],
    version: libversion,
    link_args : vflag,
    link_depends : mapfile,
-    link_with: [libfprint_private, libfprint_drivers],
+    link_with: [libfprint_drivers, libfprint_private],
    dependencies: deps,
    install: true)

@@ -268,6 +270,7 @@ libfprint_dep = declare_dependency(link_with: libfprint,
        enums_dep,
        gio_dep,
        glib_dep,
+        gobject_dep,
        gusb_dep,
    ])

@@ -324,6 +327,7 @@ if get_option('introspection')
        link_with : libfprint,
        dependencies : [
            gio_dep,
+            gobject_dep,
            gusb_dep,
        ],
        includes : [
--- a/libfprint/nbis/fix-scan-build-reports.patch
+++ b/libfprint/nbis/fix-scan-build-reports.patch
@@ -0,0 +1,57 @@
+diff --git a/libfprint/nbis/mindtct/contour.c b/libfprint/nbis/mindtct/contour.c
+index 3e9416c..31f32d0 100644
+--- mindtct/contour.c
+++ mindtct/contour.c
+@@ -440,6 +440,8 @@ int get_centered_contour(int **ocontour_x, int **ocontour_y,
+    int *contour_x, *contour_y, *contour_ex, *contour_ey, ncontour;
+    int i, j, ret;
+ 
+   g_assert (half_contour > 0);
+
+    /* Compute maximum length of complete contour */
+    /* (2 half contours + feature point).         */
+    max_contour = (half_contour<<1) + 1;
+diff --git a/libfprint/nbis/mindtct/minutia.c b/libfprint/nbis/mindtct/minutia.c
+index 0b29aa0..77cf09d 100644
+--- mindtct/minutia.c
+++ mindtct/minutia.c
+@@ -1625,7 +1625,7 @@ int process_horizontal_scan_minutia_V2(MINUTIAE *minutiae,
+                             dmapval, bdata, iw, ih, lfsparms);
+ 
+    /* If minuitia IGNORED and not added to the minutia list ... */
+-   if(ret == IGNORE)
+   if(ret != 0)
+       /* Deallocate the minutia. */
+       free_minutia(minutia);
+ 
+@@ -1776,7 +1776,7 @@ int process_vertical_scan_minutia_V2(MINUTIAE *minutiae,
+                             dmapval, bdata, iw, ih, lfsparms);
+ 
+    /* If minuitia IGNORED and not added to the minutia list ... */
+-   if(ret == IGNORE)
+   if(ret != 0)
+       /* Deallocate the minutia. */
+       free_minutia(minutia);
+ 
+diff --git a/libfprint/nbis/mindtct/ridges.c b/libfprint/nbis/mindtct/ridges.c
+index f0d9cd3..9902585 100644
+--- mindtct/ridges.c
+++ mindtct/ridges.c
+@@ -147,6 +147,8 @@ int count_minutia_ridges(const int first, MINUTIAE *minutiae,
+ {
+    int i, ret, *nbr_list, *nbr_nridges, nnbrs;
+ 
+   g_assert (lfsparms->max_nbrs > 0);
+
+    /* Find up to the maximum number of qualifying neighbors. */
+    nbr_list = NULL;
+    if((ret = find_neighbors(&nbr_list, &nnbrs, lfsparms->max_nbrs,
+@@ -407,6 +409,8 @@ int insert_neighbor(const int pos, const int nbr_index, const double nbr_dist2,
+ {
+    int i;
+ 
+   g_assert (pos >= 0);
+
+    /* If the desired insertion position is beyond one passed the last     */
+    /* neighbor in the lists OR greater than equal to the maximum ...      */
+    /* NOTE: pos is zero-oriented while nnbrs and max_nbrs are 1-oriented. */
--- a/libfprint/nbis/include/lfs.h
+++ b/libfprint/nbis/include/lfs.h
@@ -260,6 +260,8 @@ typedef struct g_lfsparms{
   int    pores_steps_bwd;
   double pores_min_dist2;
   double pores_max_ratio;
+   int    remove_perimeter_pts;
+   int    min_pp_distance;

   /* Ridge Counting Controls */
   int    max_nbrs;
@@ -609,6 +611,9 @@ typedef struct g_lfsparms{
 /* contour points to be considered a pore.                               */
 #define PORES_MAX_RATIO          2.25

+/* Points which are closer than this distance to scan perimeter will be removed */
+#define PERIMETER_PTS_DISTANCE 10
+

 /***** RIDGE COUNTING CONSTANTS *****/

@@ -1123,6 +1128,9 @@ extern int remove_or_adjust_side_minutiae(MINUTIAE *, unsigned char *,
 extern int remove_or_adjust_side_minutiae_V2(MINUTIAE *,
                  unsigned char *, const int, const int,
                  int *, const int, const int, const LFSPARMS *);
+extern int remove_perimeter_pts(MINUTIAE *minutiae,
+                  unsigned char *bdata, const int iw, const int ih,
+                  const LFSPARMS *lfsparms);

 /* results.c */
 extern int write_text_results(char *, const int, const int, const int,
--- a/libfprint/nbis/mindtct/contour.c
+++ b/libfprint/nbis/mindtct/contour.c
@@ -440,6 +440,8 @@ int get_centered_contour(int **ocontour_x, int **ocontour_y,
   int *contour_x, *contour_y, *contour_ex, *contour_ey, ncontour;
   int i, j, ret;

+   g_assert (half_contour > 0);
+
   /* Compute maximum length of complete contour */
   /* (2 half contours + feature point).         */
   max_contour = (half_contour<<1) + 1;
--- a/libfprint/nbis/mindtct/globals.c
+++ b/libfprint/nbis/mindtct/globals.c
@@ -150,6 +150,8 @@ LFSPARMS g_lfsparms = {
   PORES_STEPS_BWD,
   PORES_MIN_DIST2,
   PORES_MAX_RATIO,
+   FALSE, /* not removing perimeter points by default */
+   PERIMETER_PTS_DISTANCE,

   /* Ridge Counting Controls */
   MAX_NBRS,
@@ -234,6 +236,8 @@ LFSPARMS g_lfsparms_V2 = {
   PORES_STEPS_BWD,
   PORES_MIN_DIST2,
   PORES_MAX_RATIO,
+   FALSE, /* not removing perimeter points by default */
+   PERIMETER_PTS_DISTANCE,

   /* Ridge Counting Controls */
   MAX_NBRS,
--- a/libfprint/nbis/mindtct/minutia.c
+++ b/libfprint/nbis/mindtct/minutia.c
@@ -1625,7 +1625,7 @@ int process_horizontal_scan_minutia_V2(MINUTIAE *minutiae,
                            dmapval, bdata, iw, ih, lfsparms);

   /* If minuitia IGNORED and not added to the minutia list ... */
-   if(ret == IGNORE)
+   if(ret != 0)
      /* Deallocate the minutia. */
      free_minutia(minutia);

@@ -1776,7 +1776,7 @@ int process_vertical_scan_minutia_V2(MINUTIAE *minutiae,
                            dmapval, bdata, iw, ih, lfsparms);

   /* If minuitia IGNORED and not added to the minutia list ... */
-   if(ret == IGNORE)
+   if(ret != 0)
      /* Deallocate the minutia. */
      free_minutia(minutia);

--- a/libfprint/nbis/mindtct/remove.c
+++ b/libfprint/nbis/mindtct/remove.c
@@ -195,6 +195,11 @@ int remove_false_minutia_V2(MINUTIAE *minutiae,
      return(ret);
   }

+   /* 11. Remove minutiae on image edge */
+   if((ret = remove_perimeter_pts(minutiae, bdata, iw, ih, lfsparms))) {
+      return (ret);
+   }
+
   return(0);
 }

@@ -1329,6 +1334,159 @@ int remove_pointing_invblock_V2(MINUTIAE *minutiae,
   return(0);
 }

+static void mark_minutiae_in_range(MINUTIAE *minutiae, int *to_remove, int x, int y,
+                                   const LFSPARMS *lfsparms)
+{
+    int i, dist;
+    for (i = 0; i < minutiae->num; i++) {
+        if (to_remove[i])
+            continue;
+        dist = (int)sqrt((x - minutiae->list[i]->x) * (x - minutiae->list[i]->x) +
+                         (y - minutiae->list[i]->y) * (y - minutiae->list[i]->y));
+        if (dist < lfsparms->min_pp_distance) {
+            to_remove[i] = 1;
+        }
+    }
+}
+
+/*************************************************************************
+**************************************************************************
+#cat: remove_perimeter_pts - Takes a list of true and false minutiae and
+#cat:                attempts to detect and remove those false minutiae that
+#cat:                belong to image edge
+
+   Input:
+      minutiae  - list of true and false minutiae
+      bdata     - binary image data (0==while & 1==black)
+      iw        - width (in pixels) of image
+      ih        - height (in pixels) of image
+      lfsparms  - parameters and thresholds for controlling LFS
+   Output:
+      minutiae  - list of pruned minutiae
+   Return Code:
+      Zero     - successful completion
+      Negative - system error
+**************************************************************************/
+int remove_perimeter_pts(MINUTIAE *minutiae,
+                       unsigned char *bdata, const int iw, const int ih,
+                       const LFSPARMS *lfsparms)
+{
+    int i, j, ret, *to_remove;
+    int *left, *left_up, *left_down;
+    int *right, *right_up, *right_down;
+    int removed = 0;
+    int left_min, right_max;
+
+    if (!lfsparms->remove_perimeter_pts)
+        return(0);
+
+    to_remove = calloc(minutiae->num, sizeof(int));
+    left = calloc(ih, sizeof(int));
+    left_up = calloc(ih, sizeof(int));
+    left_down = calloc(ih, sizeof(int));
+    right = calloc(ih, sizeof(int));
+    right_up = calloc(ih, sizeof(int));
+    right_down = calloc(ih, sizeof(int));
+
+    /* Pass downwards */
+    left_min = iw - 1;
+    right_max = 0;
+    for (i = 0; i < ih; i++) {
+        for (j = 0; j < left_min; j++) {
+            if ((bdata[i * iw + j] != 0)) {
+                left_min = j;
+                break;
+            }
+        }
+        if (left_min == (iw - 1))
+            left_down[i] = -1;
+        else
+            left_down[i] = left_min;
+        for (j = iw - 1; j >= right_max; j--) {
+            if ((bdata[i * iw + j] != 0)) {
+                right_max = j;
+                break;
+            }
+        }
+        if (right_max == 0)
+            right_down[i] = -1;
+        else
+            right_down[i] = right_max;
+    }
+
+    /* Pass upwards */
+    left_min = iw - 1;
+    right_max = 0;
+    for (i = ih - 1; i >= 0; i--) {
+        for (j = 0; j < left_min; j++) {
+            if ((bdata[i * iw + j] != 0)) {
+                left_min = j;
+                break;
+            }
+        }
+        if (left_min == (iw - 1))
+            left_up[i] = -1;
+        else
+            left_up[i] = left_min;
+        for (j = iw - 1; j >= right_max; j--) {
+            if ((bdata[i * iw + j] != 0)) {
+                right_max = j;
+                break;
+            }
+        }
+        if (right_max == 0)
+            right_up[i] = -1;
+        else
+            right_up[i] = right_max;
+    }
+
+    /* Merge */
+    left_min = left_down[ih - 1];
+    right_max = right_down[ih - 1];
+    for (i = 0; i < ih; i++) {
+        if (left_down[i] != left_min)
+            left[i] = left_down[i];
+        else
+            left[i] = left_up[i];
+
+        if (right_down[i] != right_max)
+            right[i] = right_down[i];
+        else
+            right[i] = right_up[i];
+    }
+    free(left_up);
+    free(left_down);
+    free(right_up);
+    free(right_down);
+
+    /* Mark minitiae close to the edge */
+    for (i = 0; i < ih; i++) {
+        if (left[i] != -1)
+            mark_minutiae_in_range(minutiae, to_remove, left[i], i, lfsparms);
+        if (right[i] != -1)
+            mark_minutiae_in_range(minutiae, to_remove, right[i], i, lfsparms);
+    }
+
+    free(left);
+    free(right);
+
+    for (i = minutiae->num - 1; i >= 0; i--) {
+        /* If the current minutia index is flagged for removal ... */
+        if (to_remove[i]){
+            removed ++;
+            /* Remove the minutia from the minutiae list. */
+            if((ret = remove_minutia(i, minutiae))){
+                free(to_remove);
+                return(ret);
+            }
+        }
+    }
+
+    free(to_remove);
+
+    return (0);
+}
+
 /*************************************************************************
 **************************************************************************
 #cat: remove_overlaps - Takes a list of true and false minutiae and
--- a/libfprint/nbis/mindtct/ridges.c
+++ b/libfprint/nbis/mindtct/ridges.c
@@ -147,6 +147,8 @@ int count_minutia_ridges(const int first, MINUTIAE *minutiae,
 {
   int i, ret, *nbr_list, *nbr_nridges, nnbrs;

+   g_assert (lfsparms->max_nbrs > 0);
+
   /* Find up to the maximum number of qualifying neighbors. */
   nbr_list = NULL;
   if((ret = find_neighbors(&nbr_list, &nnbrs, lfsparms->max_nbrs,
@@ -407,6 +409,8 @@ int insert_neighbor(const int pos, const int nbr_index, const double nbr_dist2,
 {
   int i;

+   g_assert (pos >= 0);
+
   /* If the desired insertion position is beyond one passed the last     */
   /* neighbor in the lists OR greater than equal to the maximum ...      */
   /* NOTE: pos is zero-oriented while nnbrs and max_nbrs are 1-oriented. */
--- a/libfprint/nbis/remove-perimeter-pts.patch
+++ b/libfprint/nbis/remove-perimeter-pts.patch
@@ -0,0 +1,231 @@
+diff --git nbis/include/lfs.h nbis/include/lfs.h
+index f4f38d7..8b12e73 100644
+--- nbis/include/lfs.h
+++ nbis/include/lfs.h
+@@ -260,6 +260,8 @@ typedef struct g_lfsparms{
+    int    pores_steps_bwd;
+    double pores_min_dist2;
+    double pores_max_ratio;
+   int    remove_perimeter_pts;
+   int    min_pp_distance;
+ 
+    /* Ridge Counting Controls */
+    int    max_nbrs;
+@@ -609,6 +611,9 @@ typedef struct g_lfsparms{
+ /* contour points to be considered a pore.                               */
+ #define PORES_MAX_RATIO          2.25
+ 
+/* Points which are closer than this distance to scan perimeter will be removed */
+#define PERIMETER_PTS_DISTANCE 10
+
+ 
+ /***** RIDGE COUNTING CONSTANTS *****/
+ 
+@@ -1123,6 +1128,9 @@ extern int remove_or_adjust_side_minutiae(MINUTIAE *, unsigned char *,
+ extern int remove_or_adjust_side_minutiae_V2(MINUTIAE *,
+                   unsigned char *, const int, const int,
+                   int *, const int, const int, const LFSPARMS *);
+extern int remove_perimeter_pts(MINUTIAE *minutiae,
+                  unsigned char *bdata, const int iw, const int ih,
+                  const LFSPARMS *lfsparms);
+ 
+ /* results.c */
+ extern int write_text_results(char *, const int, const int, const int,
+diff --git nbis/mindtct/globals.c nbis/mindtct/globals.c
+index da10c15..79bc583 100644
+--- nbis/mindtct/globals.c
+++ nbis/mindtct/globals.c
+@@ -150,6 +150,8 @@ LFSPARMS g_lfsparms = {
+    PORES_STEPS_BWD,
+    PORES_MIN_DIST2,
+    PORES_MAX_RATIO,
+   FALSE, /* not removing perimeter points by default */
+   PERIMETER_PTS_DISTANCE,
+ 
+    /* Ridge Counting Controls */
+    MAX_NBRS,
+@@ -234,6 +236,8 @@ LFSPARMS g_lfsparms_V2 = {
+    PORES_STEPS_BWD,
+    PORES_MIN_DIST2,
+    PORES_MAX_RATIO,
+   FALSE, /* not removing perimeter points by default */
+   PERIMETER_PTS_DISTANCE,
+ 
+    /* Ridge Counting Controls */
+    MAX_NBRS,
+diff --git nbis/mindtct/remove.c nbis/mindtct/remove.c
+index af5ab7d..7311f1c 100644
+--- nbis/mindtct/remove.c
+++ nbis/mindtct/remove.c
+@@ -195,6 +195,11 @@ int remove_false_minutia_V2(MINUTIAE *minutiae,
+       return(ret);
+    }
+ 
+   /* 11. Remove minutiae on image edge */
+   if((ret = remove_perimeter_pts(minutiae, bdata, iw, ih, lfsparms))) {
+      return (ret);
+   }
+
+    return(0);
+ }
+ 
+@@ -1329,6 +1334,159 @@ int remove_pointing_invblock_V2(MINUTIAE *minutiae,
+    return(0);
+ }
+ 
+static void mark_minutiae_in_range(MINUTIAE *minutiae, int *to_remove, int x, int y,
+                                   const LFSPARMS *lfsparms)
+{
+    int i, dist;
+    for (i = 0; i < minutiae->num; i++) {
+        if (to_remove[i])
+            continue;
+        dist = (int)sqrt((x - minutiae->list[i]->x) * (x - minutiae->list[i]->x) +
+                         (y - minutiae->list[i]->y) * (y - minutiae->list[i]->y));
+        if (dist < lfsparms->min_pp_distance) {
+            to_remove[i] = 1;
+        }
+    }
+}
+
+/*************************************************************************
+**************************************************************************
+#cat: remove_perimeter_pts - Takes a list of true and false minutiae and
+#cat:                attempts to detect and remove those false minutiae that
+#cat:                belong to image edge
+
+   Input:
+      minutiae  - list of true and false minutiae
+      bdata     - binary image data (0==while & 1==black)
+      iw        - width (in pixels) of image
+      ih        - height (in pixels) of image
+      lfsparms  - parameters and thresholds for controlling LFS
+   Output:
+      minutiae  - list of pruned minutiae
+   Return Code:
+      Zero     - successful completion
+      Negative - system error
+**************************************************************************/
+int remove_perimeter_pts(MINUTIAE *minutiae,
+                       unsigned char *bdata, const int iw, const int ih,
+                       const LFSPARMS *lfsparms)
+{
+    int i, j, ret, *to_remove;
+    int *left, *left_up, *left_down;
+    int *right, *right_up, *right_down;
+    int removed = 0;
+    int left_min, right_max;
+
+    if (!lfsparms->remove_perimeter_pts)
+        return(0);
+
+    to_remove = calloc(minutiae->num, sizeof(int));
+    left = calloc(ih, sizeof(int));
+    left_up = calloc(ih, sizeof(int));
+    left_down = calloc(ih, sizeof(int));
+    right = calloc(ih, sizeof(int));
+    right_up = calloc(ih, sizeof(int));
+    right_down = calloc(ih, sizeof(int));
+
+    /* Pass downwards */
+    left_min = iw - 1;
+    right_max = 0;
+    for (i = 0; i < ih; i++) {
+        for (j = 0; j < left_min; j++) {
+            if ((bdata[i * iw + j] != 0)) {
+                left_min = j;
+                break;
+            }
+        }
+        if (left_min == (iw - 1))
+            left_down[i] = -1;
+        else
+            left_down[i] = left_min;
+        for (j = iw - 1; j >= right_max; j--) {
+            if ((bdata[i * iw + j] != 0)) {
+                right_max = j;
+                break;
+            }
+        }
+        if (right_max == 0)
+            right_down[i] = -1;
+        else
+            right_down[i] = right_max;
+    }
+
+    /* Pass upwards */
+    left_min = iw - 1;
+    right_max = 0;
+    for (i = ih - 1; i >= 0; i--) {
+        for (j = 0; j < left_min; j++) {
+            if ((bdata[i * iw + j] != 0)) {
+                left_min = j;
+                break;
+            }
+        }
+        if (left_min == (iw - 1))
+            left_up[i] = -1;
+        else
+            left_up[i] = left_min;
+        for (j = iw - 1; j >= right_max; j--) {
+            if ((bdata[i * iw + j] != 0)) {
+                right_max = j;
+                break;
+            }
+        }
+        if (right_max == 0)
+            right_up[i] = -1;
+        else
+            right_up[i] = right_max;
+    }
+
+    /* Merge */
+    left_min = left_down[ih - 1];
+    right_max = right_down[ih - 1];
+    for (i = 0; i < ih; i++) {
+        if (left_down[i] != left_min)
+            left[i] = left_down[i];
+        else
+            left[i] = left_up[i];
+
+        if (right_down[i] != right_max)
+            right[i] = right_down[i];
+        else
+            right[i] = right_up[i];
+    }
+    free(left_up);
+    free(left_down);
+    free(right_up);
+    free(right_down);
+
+    /* Mark minitiae close to the edge */
+    for (i = 0; i < ih; i++) {
+        if (left[i] != -1)
+            mark_minutiae_in_range(minutiae, to_remove, left[i], i, lfsparms);
+        if (right[i] != -1)
+            mark_minutiae_in_range(minutiae, to_remove, right[i], i, lfsparms);
+    }
+
+    free(left);
+    free(right);
+
+    for (i = minutiae->num - 1; i >= 0; i--) {
+        /* If the current minutia index is flagged for removal ... */
+        if (to_remove[i]){
+            removed ++;
+            /* Remove the minutia from the minutiae list. */
+            if((ret = remove_minutia(i, minutiae))){
+                free(to_remove);
+                return(ret);
+            }
+        }
+    }
+
+    free(to_remove);
+
+    return (0);
+}
+
+ /*************************************************************************
+ **************************************************************************
+ #cat: remove_overlaps - Takes a list of true and false minutiae and
--- a/libfprint/nbis/update-from-nbis.sh
+++ b/libfprint/nbis/update-from-nbis.sh
@@ -192,3 +192,9 @@ spatch --sp-file remove-global-y.cocci bozorth3/* include/bozorth.h --in-place
 # The above leaves an unused variable around, triggering a warning
 # remove it.
 patch -p0 < glib-mem-warning.patch
+
+# Also fix some scan-build warnings, mostly by adding assertions
+patch -p0 < fix-scan-build-reports.patch
+
+# Add pass to remove perimeter points
+patch -p0 < remove-perimeter-pts.patch
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,7 @@ versioned_libname = meson.project_name() + '-' + soversion.to_string()
 # Dependencies
 glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
 gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
+gobject_dep = dependency('gobject-2.0', version: '>=' + glib_min_version)
 gusb_dep = dependency('gusb', version: '>= 0.2.0')
 mathlib_dep = cc.find_library('m', required: false)

@@ -210,6 +211,7 @@ pkgconfig.generate(
    description: 'Generic C API for fingerprint reader access',
    version: meson.project_version(),
    libraries: libfprint,
+    requires: [gio_dep, gobject_dep],
    subdirs: versioned_libname,
    filebase: versioned_libname,
 )
--- a/tests/elan/capture.ioctl
+++ b/tests/elan/capture.ioctl
--- a/tests/test-device-fake.c
+++ b/tests/test-device-fake.c
@@ -100,7 +100,10 @@ fpi_device_fake_enroll (FpDevice *device)
  fpi_device_get_enroll_data (device, (FpPrint **) &fake_dev->action_data);

  if (!print && !fake_dev->ret_error)
-    fpi_device_get_enroll_data (device, &print);
+    {
+      fpi_device_get_enroll_data (device, &print);
+      fpi_print_set_type (print, FPI_PRINT_RAW);
+    }

  fpi_device_enroll_complete (device,
                              print ? g_object_ref (print) : NULL,
@@ -189,6 +192,7 @@ static void
 fpi_device_fake_capture (FpDevice *device)
 {
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+  gboolean wait_for_finger;

  fake_dev->last_called_function = fpi_device_fake_capture;
  g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE);
@@ -199,7 +203,8 @@ fpi_device_fake_capture (FpDevice *device)
      return;
    }

-  fpi_device_get_capture_data (device, (gboolean *) &fake_dev->action_data);
+  fpi_device_get_capture_data (device, &wait_for_finger);
+  fake_dev->action_data = GINT_TO_POINTER (wait_for_finger);
  fpi_device_capture_complete (device, fake_dev->ret_image, fake_dev->ret_error);
 }

@@ -234,7 +239,7 @@ fpi_device_fake_delete (FpDevice *device)
      return;
    }

-  fpi_device_get_delete_data (device, (gpointer) (&fake_dev->action_data));
+  fpi_device_get_delete_data (device, (FpPrint **) (&fake_dev->action_data));
  fpi_device_delete_complete (device, fake_dev->ret_error);
 }

--- a/tests/test-fpi-assembling.c
+++ b/tests/test-fpi-assembling.c
@@ -81,6 +81,8 @@ test_frame_assembling (void)
  ctx.frame_height = 20;
  ctx.image_width = width;

+  g_assert (height > ctx.frame_height);
+
  offset = 10;
  test_height = height - (height - ctx.frame_height) % offset;

--- a/tests/test-fpi-device.c
+++ b/tests/test-fpi-device.c
@@ -541,6 +541,24 @@ test_driver_enroll_error_no_print (void)
  g_assert_true (error == g_steal_pointer (&fake_dev->ret_error));
  g_assert_null (out_print);
  g_assert_null (fake_dev->ret_print);
+  g_clear_error (&error);
+
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+                         "*Driver did not set the type on the returned print*");
+
+  fake_dev->ret_error = NULL;
+  fake_dev->ret_print = fp_print_new (device); /* Type not set. */
+  g_object_add_weak_pointer (G_OBJECT (fake_dev->ret_print),
+                             (gpointer) (&fake_dev->ret_print));
+  out_print =
+    fp_device_enroll_sync (device, fp_print_new (device), NULL, NULL, NULL, &error);
+
+  g_test_assert_expected_messages ();
+  g_assert (fake_dev->last_called_function == dev_class->enroll);
+  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL);
+  g_assert_null (out_print);
+  g_assert_null (fake_dev->ret_print);
+  g_clear_error (&error);
 }

 typedef struct
@@ -635,7 +653,7 @@ test_driver_enroll_progress (void)
 {
  g_autoptr(FpAutoResetClass) dev_class = auto_reset_device_class ();
  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) enrolled_print = NULL;
+  G_GNUC_UNUSED g_autoptr(FpPrint) enrolled_print = NULL;
  ExpectedEnrollData expected_enroll_data = {0};
  FpiDeviceFake *fake_dev;

@@ -959,7 +977,7 @@ test_driver_verify_complete_retry (void)

  g_test_assert_expected_messages ();
  g_assert_true (error != g_steal_pointer (&fake_dev->ret_error));
-  g_assert_true (error != g_steal_pointer (&fake_dev->user_data));
+  g_steal_pointer (&fake_dev->user_data);
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL);
  g_assert_true (match_data->called);
  g_assert_error (match_data->error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_TOO_SHORT);
@@ -981,7 +999,7 @@ test_driver_verify_complete_retry (void)
  g_test_assert_expected_messages ();

  g_assert_true (error != g_steal_pointer (&fake_dev->ret_error));
-  g_assert_true (error != g_steal_pointer (&fake_dev->user_data));
+  g_steal_pointer (&fake_dev->user_data);
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL);
  g_assert_true (match_data->called);
  g_assert_error (match_data->error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_TOO_SHORT);
@@ -1001,7 +1019,7 @@ test_driver_verify_complete_retry (void)
  g_test_assert_expected_messages ();

  g_assert_true (error != g_steal_pointer (&fake_dev->ret_error));
-  g_assert_true (error != g_steal_pointer (&fake_dev->user_data));
+  g_steal_pointer (&fake_dev->user_data);
  g_assert_error (error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_GENERAL);
  g_assert_true (match_data->called);
  g_assert_error (match_data->error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_GENERAL);
@@ -1296,7 +1314,7 @@ test_driver_identify_complete_retry (void)
  g_test_assert_expected_messages ();

  g_assert_true (error != g_steal_pointer (&fake_dev->ret_error));
-  g_assert_true (error != g_steal_pointer (&fake_dev->user_data));
+  g_steal_pointer (&fake_dev->user_data);
  g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL);
  g_assert_true (match_data->called);
  g_assert_error (match_data->error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_TOO_SHORT);
@@ -1355,7 +1373,7 @@ test_driver_identify_report_no_callback (void)
  g_autoptr(MatchCbData) match_data = g_new0 (MatchCbData, 1);
  g_autoptr(GPtrArray) prints = g_ptr_array_new_with_free_func (g_object_unref);
  g_autoptr(FpAutoCloseDevice) device = NULL;
-  g_autoptr(FpPrint) enrolled_print = NULL;
+  G_GNUC_UNUSED g_autoptr(FpPrint) enrolled_print = NULL;
  g_autoptr(FpPrint) print = NULL;
  g_autoptr(FpPrint) match = NULL;
  g_autoptr(GError) error = NULL;
@@ -1493,6 +1511,7 @@ test_driver_list (void)
  g_autoptr(FpAutoCloseDevice) device = auto_close_fake_device_new ();
  FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device);
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+
  g_autoptr(GPtrArray) prints = g_ptr_array_new_with_free_func (g_object_unref);
  unsigned int i;

@@ -1515,6 +1534,7 @@ test_driver_list_error (void)
  g_autoptr(FpAutoCloseDevice) device = auto_close_fake_device_new ();
  FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device);
  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+
  g_autoptr(GPtrArray) prints = NULL;

  fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_GENERAL);
@@ -1891,7 +1911,7 @@ test_driver_action_error_all (void)
  g_autoptr(GPtrArray) prints = g_ptr_array_new_with_free_func (g_object_unref);
  g_autoptr(GError) error = NULL;
  FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device);
-  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+  FpiDeviceFake *fake_dev;

  fake_dev = FPI_DEVICE_FAKE (device);
  fake_dev->return_action_error = TRUE;
@@ -1962,7 +1982,7 @@ test_driver_action_error_fallback_all (void)
  g_autoptr(GPtrArray) prints = g_ptr_array_new_with_free_func (g_object_unref);
  g_autoptr(GError) error = NULL;
  FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device);
-  FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+  FpiDeviceFake *fake_dev;

  fake_dev = FPI_DEVICE_FAKE (device);
  fake_dev->return_action_error = TRUE;
--- a/tests/test-fpi-ssm.c
+++ b/tests/test-fpi-ssm.c
@@ -200,7 +200,7 @@ test_ssm_new_full (void)
 static void
 test_ssm_new_no_handler (void)
 {
-  g_autoptr(FpiSsm) ssm = NULL;
+  G_GNUC_UNUSED g_autoptr(FpiSsm) ssm = NULL;

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                         "*BUG:*handler*");
@@ -211,7 +211,7 @@ test_ssm_new_no_handler (void)
 static void
 test_ssm_new_wrong_states (void)
 {
-  g_autoptr(FpiSsm) ssm = NULL;
+  G_GNUC_UNUSED g_autoptr(FpiSsm) ssm = NULL;

  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
                         "*BUG:*nr_states*");
@@ -1172,6 +1172,7 @@ test_ssm_subssm_start (void)
  g_autoptr(FpiSsm) subssm =
    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
  g_autoptr(FpiSsmTestData) subdata =
    fpi_ssm_test_data_ref (fpi_ssm_get_data (subssm));

@@ -1262,6 +1263,7 @@ test_ssm_subssm_start_with_started (void)
  g_autoptr(FpiSsm) subssm =
    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
  g_autoptr(FpiSsmTestData) subdata =
    fpi_ssm_test_data_ref (fpi_ssm_get_data (subssm));

@@ -1305,6 +1307,7 @@ test_ssm_subssm_start_with_delayed (void)
  g_autoptr(FpiSsm) subssm =
    ssm_test_new_full (FPI_TEST_SSM_STATE_NUM, "FPI_TEST_SUB_SSM");
  FpiSsmTestData *data = fpi_ssm_get_data (ssm);
+
  g_autoptr(FpiSsmTestData) subdata =
    fpi_ssm_test_data_ref (fpi_ssm_get_data (subssm));
  gpointer timeout_tracker = GUINT_TO_POINTER (TRUE);
--- a/tests/virtual-image.py
+++ b/tests/virtual-image.py
@@ -3,11 +3,10 @@
 import sys
 try:
    import gi
-    gi.require_version('FPrint', '2.0')
-    from gi.repository import FPrint, GLib, Gio
-
    import os
-    import sys
+
+    from gi.repository import GLib, Gio
+
    import unittest
    import socket
    import struct
@@ -20,6 +19,8 @@ except Exception as e:
    print("Missing dependencies: %s" % str(e))
    sys.exit(77)

+FPrint = None
+
 # Re-run the test with the passed wrapper if set
 wrapper = os.getenv('LIBFPRINT_TEST_WRAPPER')
 if wrapper:
@@ -101,12 +102,14 @@ class VirtualImage(unittest.TestCase):
        del self.con
        self.dev.close_sync()

-    def send_retry(self, retry_error=FPrint.DeviceRetry.TOO_SHORT, iterate=True):
+    def send_retry(self, retry_error=None, iterate=True):
+        retry_error = retry_error if retry_error else FPrint.DeviceRetry.TOO_SHORT
        self.con.sendall(struct.pack('ii', -1, retry_error))
        while iterate and ctx.pending():
            ctx.iteration(False)

-    def send_error(self, device_error=FPrint.DeviceError.GENERAL, iterate=True):
+    def send_error(self, device_error=None, iterate=True):
+        device_error = device_error if device_error else FPrint.DeviceError.GENERAL
        self.con.sendall(struct.pack('ii', -2, device_error))
        while iterate and ctx.pending():
            ctx.iteration(False)
@@ -346,5 +349,12 @@ class VirtualImage(unittest.TestCase):
        assert(not self._verify_match)

 if __name__ == '__main__':
+    try:
+        gi.require_version('FPrint', '2.0')
+        from gi.repository import FPrint
+    except Exception as e:
+        print("Missing dependencies: %s" % str(e))
+        sys.exit(77)
+
    # avoid writing to stderr
    unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))
Author	SHA1	Message	Date
Benjamin Berg	b137807420	upekts: Fix error reporting during verify We delayed the wrong error types for the early reporting mechanism.	2020-06-05 14:48:57 +00:00
Benjamin Berg	0936fc3597	upekts: Fix error handling in verify_stop_deinit_cb The error memory management was incorrect possibly causing double free's and critical warnings.	2020-06-05 14:48:57 +00:00
Benjamin Berg	b7f436e8de	upekts: Fix reading of fingerprint data for verification the code tried to fetch the data from the device rather the print. Obviously, this could never work.	2020-06-05 14:48:57 +00:00
Benjamin Berg	4f0b0fa526	tests: Ensure FpDevice checks enrolled prints for completeness Enrolled prints need to have their type set. FpDevice should ensure that is the case when a driver returns a print back.	2020-06-05 14:48:57 +00:00
Benjamin Berg	f0abefa9fa	device: Ensure enrolled print as an appropriate type set The driver might forget to set the type of the print. Catch that error a bit earlier rather than failing when the API user tries to load it from disk again.	2020-06-05 14:48:57 +00:00
Benjamin Berg	7f58556011	tests: An enrolled print needs to have a type set	2020-06-05 14:48:57 +00:00
Benjamin Berg	cecb01bcb9	upekts: Set the print type during enroll The type of the print (RAW or NBIS) needs to be filled in by the driver. For most drivers the image devices does this (NBIS), but the corresponding call was missing in the upekts driver, rendering the enrolled print unusable.	2020-06-05 14:48:57 +00:00
Benjamin Berg	b95402bc72	upekts: Fix memory leak and remove unneeded copy __handle_incoming_msg would copy the payload of the message into a newly created buffer just to destroy it again immediately after calling the callback. Just reference the correct address inside the original package instead. Also, in one case the extra buffer was leaked afterwards.	2020-06-05 14:48:57 +00:00
Benjamin Berg	484743f652	upekts: Assert correct packet length in __handle_incoming_msg The surrounding code already checks this and reads the correct amount. Add an assert to ensure we really never do an out of bounds read.	2020-06-05 14:48:57 +00:00
Benjamin Berg	a5cfc1644f	upekts: Fix 9 byte buffer overflow while reading extended data The driver would correctly calculate the amount of extra space needed to receive the whole packet. It would also request the correct number of bytes for this transfer. However, the reallocated buffer to hold this data was directly derived from the expected payload size and did not include the overhead. Make the code more explicit and get rid of the confusing MAX_DATA_IN_READ_BUF define that hides details on buffer allocation calculation from the code.	2020-06-05 14:48:57 +00:00
Benjamin Berg	b3565b83e1	upekts: Only release USB interface on exit The device is already beeing de-initialised from the verify/enroll commands. Trying it again will result in a timeout error as it is not responding properly at that point.	2020-06-05 14:48:57 +00:00
Benjamin Berg	8f46de0a60	upekts: Fix reference counting in do_enroll_stop The print passed to do_enroll_stop does not need to be ref'ed in the function.	2020-06-05 14:48:57 +00:00
Benjamin Berg	b3c5fe4b82	upekts: Fix ownership transfer to fpi_device_enroll_complete fpi_device_enroll_complete takes the ownership of the pointers. As such, they need to be stolen from EnrollStopData.	2020-06-05 14:48:57 +00:00
Vasily Khoruzhick	4cf5f92a52	lib: re-add partial image flag And activate perimeter points removal if this flag is set This flag should be set for aes1610, aesx660, aes2501, aes2550 and upektc_img since these sensors may produce incomplete image. Fixes: #142	2020-06-04 09:34:31 -07:00
Vasily Khoruzhick	297236b51a	nbis: re-add step to remove perimeter points This step helps to drop false minutiae for short sensors and it was accidentally dropped during NBIS update. Re-add this step and add a patch to update script to ensure that it's not dropped during next update. Fixes: `9fb789dc78` ("nbis: Update to NBIS 5.0.0")	2020-06-03 20:44:41 -07:00
Benjamin Berg	8626c64831	ci: Output diff of uncrustify check Not having the diff is a bit painfull when the local version of uncrustify differs from the one on the CI runner. So uncrustify in-place and output the diff.	2020-06-02 11:56:19 +00:00
Benjamin Berg	e4f9935706	Uncrustify with newer version	2020-06-02 11:56:19 +00:00
Benjamin Berg	8ba29606bb	Add MAINTAINERS file	2020-05-22 15:00:11 +02:00
Evgeny Gagauz	1b74813adf	vfs0050: Stop capture after a timeout happens If a transfer errors out then actual_length is negative. The only error that is not caught is a timeout error, which should also result in the SSM to move to the next state.	2020-05-13 09:51:23 +00:00
Benjamin Berg	07ff03970f	libfprint: Fix a few issues with the documentation This must have been broken all along. Get it into a better shape. Looks like mostly cases of bad copy/paste.	2020-05-11 20:51:29 +02:00
Benjamin Berg	25ab4849a4	doc: Move sections and fix title for internal FpImageDevice Otherwise the public API page (which is empty) is overwritten.	2020-05-11 20:51:29 +02:00
Benjamin Berg	840bcc77a5	ci: Export HTML documentation as artifacts We build the HTML documentation. For feature branches, it is convenient to be able to view the documentation easily. Expose them as artifacts and add a link to the browser underneath the pipeline in the MR. Unfortunately, it does not seem to be possible to link directly to the HTML.	2020-05-11 20:51:29 +02:00
Benjamin Berg	a464f602ca	nbis: Apply patch to fix scan-build warnings Apply the newly added patch to the checkout.	2020-05-07 14:22:02 +00:00
Benjamin Berg	ad17011e68	nbis: Add patch to fix warnings reported by scan-build This patch basically only adds annotations. None of the errors can be hit in practice.	2020-05-07 14:22:02 +00:00
Benjamin Berg	744a71ce08	vfs301: Assert hex string has 2 or more characters Otherwise static analysis thinks we may end up allocating a 0 byte output buffer.	2020-05-07 14:22:02 +00:00
Benjamin Berg	422fc5facf	tests: Add unused annotation The variables exist for memory management but are unused otherwise. Tag them as such.	2020-05-07 14:22:02 +00:00
Benjamin Berg	6d542edf8a	test: Remove unused initialisers Make the static analysis happy.	2020-05-07 14:22:02 +00:00
Benjamin Berg	8d4d56b1f1	tests: Annotate a few variables as unused These solely exist for memory management, but the static analysis complains.	2020-05-07 14:22:02 +00:00
Benjamin Berg	6e30a1ee45	print: Fix "possible leak" warning by moving initialization For some reason static checkers report that the auto-free is not run if the goto exists the loop. It seems to me like that should work fine, but we can simply make the analysers happy by moving it.	2020-05-07 14:22:02 +00:00
Benjamin Berg	87c3b9c5ba	upekts: Fix possible NULL pointer access Reported by scan-build.	2020-05-07 14:22:02 +00:00
Benjamin Berg	0a08a6a7c0	ci: Run clang scan-build test as part of CI	2020-05-07 14:22:02 +00:00
Benjamin Berg	9db89e00d0	elan: Downgrade g_message to debug severity See: #211	2020-05-07 13:55:35 +00:00
Benjamin Berg	3ad65b9589	vfs5011: Prevent too small images We need more than 1 line for assembling, but in general, we should have a reasonable amount of lines. So use the width in the hope we'll get an image that is about square at least. Closes: #135	2020-05-07 13:55:35 +00:00
Benjamin Berg	48aa6d0252	upekts: Fix regression during initialisation The driver has two helper functions to format a command. In one case, the function was accidentally changed during the port to the new driver APIs. See https://bugzilla.redhat.com/show_bug.cgi?id=1832229	2020-05-07 09:55:13 +02:00
Michal Prívozník	eefc954f91	context: Fix order of PID/VID in a debug message When no driver is found for an USB device a debug message is printed. However, it has PID and VID in wrong order - usually it is Vendor ID which goes first. This is how 'lsusb' prints it. Matching the order helps debugging. Signed-off-by: Michal Privoznik <michal@privoznik.com>	2020-04-27 16:16:43 +02:00
Michal Prívozník	5bcf9ac008	print: Include "fpi-compact.h" In the fpi_print_fill_from_user_id() GDate is defined using g_autoptr(). However, this requires new enough GLib. For older versions there's a definition provided locally in fpi-compact.h. Include the file to fix build with older version of GLib. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>	2020-04-27 16:16:39 +02:00
Benjamin Berg	d2402309ee	examples: Cancel verify operation on Ctrl+C This makes it easier to do basic testing of cancellation paths in the drivers.	2020-04-24 18:40:48 +00:00
Benjamin Berg	a651b65401	example: Cancel enroll operation on Ctrl+C This makes it easier to do basic testing of cancellation paths in the drivers.	2020-04-24 18:40:48 +00:00
Marco Trevisan (Treviño)	bc3f622b2a	context: Factorize duplicated code	2020-04-24 20:21:01 +02:00
Marco Trevisan (Treviño)	5de49b33e6	image-device: Terminate the current action with error on print failure If we fail when setting the scanned image to a print, we'll have a fatal error, in such case we can terminate the current action and deactivate the device.	2020-04-24 20:09:56 +02:00
Marco Trevisan (Treviño)	81e198c034	image: Return an error if we got an empty or NULL minutiae array In some cases nbim's get_minutiae returns no minutiae without providing an error code, and if this happens we would crash in the task callback function as we would try to deference the data->minutiae pointer. Related to: #251	2020-04-24 20:09:56 +02:00
Marco Trevisan (Treviño)	c0895a858d	etes603: Return TOO_SHORT retry error for small images If the image height is less than the sensor horizontal resolution, then return a retry error rather than trying to submit the image for further processing. Related to: #251	2020-04-24 20:03:51 +02:00
Benjamin Berg	5d5995f201	image: Check for task success rather than just cancellation The minutiae detection might fail and we must not copy any data at that point. So check g_task_had_error to ensure that we only do so when the task was successful. Fixes: #251	2020-04-24 20:03:37 +02:00
Benjamin Berg	f71045b743	synaptics: Use the FpPrint ID generation functionality As the functionality is now part of the internal FpPrint API, it makes sene to use it.	2020-04-20 16:43:52 +02:00
Benjamin Berg	0274d0783b	print: Add helpers to generate a unique print ID containing metadata It makes sense to include this functionality in the core library as more than one driver will be using it soon.	2020-04-20 16:43:52 +02:00
Bastien Nocera	5c5a4f6907	upekts: Fix memory leak Don't allocate a new finger print structure, the fpi_device_get_enroll_data() just below will overwrite it.	2020-04-15 15:55:39 +02:00
Bastien Nocera	5b6f5c9aad	synaptics: Don't pass always-NULL value No need to pass "error" to this report function, it will always be NULL.	2020-04-15 15:55:39 +02:00
Marco Trevisan (Treviño)	41e05b1133	test-fpi-device: Don't compare error pointers that have been cleared During verify/identify complete we replace the error pointer that the driver returned with another error we created, after clearing that one. However, when we initialize a new error the compiler may reuse the same allocation of the cleared one, and this might lead to a test failure. So, don't be so fragile and ignore the pointer check	2020-04-15 14:19:53 +02:00
Bastien Nocera	579e01359b	fp-print: Fix sign-compare warnings libfprint/fp-print.c: In function ‘fp_print_equal’: libfprint/fp-print.c:596:21: warning: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} [-Wsign-compare] 596 \| for (i = 0; i < self->prints->len; i++) \| ^ libfprint/fp-print.c: In function ‘fp_print_serialize’: libfprint/fp-print.c:667:21: warning: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘guint’ {aka ‘unsigned int’} [-Wsign-compare] 667 \| for (i = 0; i < print->prints->len; i++) \| ^ libfprint/fp-print.c: In function ‘fp_print_deserialize’: libfprint/fp-print.c:823:21: warning: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘gsize’ {aka ‘long unsigned int’} [-Wsign-compare] 823 \| for (i = 0; i < g_variant_n_children (prints); i++) \| ^	2020-04-15 12:48:05 +02:00
Bastien Nocera	cc887c1a37	libfprint: Fix typos	2020-04-14 13:51:02 +02:00
Bastien Nocera	fdd2d6abf8	fprint-list: Fix typos in Copyright statements	2020-04-14 13:51:02 +02:00
Bastien Nocera	6bf29108a1	examples: Fix typo	2020-04-14 13:51:02 +02:00
Bastien Nocera	d0751ae06b	tests/elan: Fix typos	2020-04-14 13:51:02 +02:00
Bastien Nocera	a218a5efdd	virtual-image: Fix typo	2020-04-14 13:51:01 +02:00
Bastien Nocera	c6ae8e58a4	elan: Fix typo	2020-04-14 13:50:49 +02:00
Bastien Nocera	87c7894c28	synaptics: Fix typos	2020-04-14 13:47:48 +02:00
Marco Trevisan (Treviño)	e7ff4f705c	tests: Import FPrint only during execution not when parsing The unittest_parser script would try to import FPrint gi module, but it would fail as per the fact that none is installed yet, so make sure that we don't load any FPrint module until we try to actually run the tests	2020-03-27 21:19:09 +00:00
Marco Trevisan (Treviño)	c26588942a	ci: Print coverage data once available so that gitlab can parse it	2020-03-27 00:00:07 +01:00
Laurent Bigonville	3d68cddfe7	Properly set the dependencies in the pkg-config file The public API uses gio and gobject header, ensure that these are in the list of Required pkg-config modules, otherwise they are added to Required.private which is not OK.	2020-03-20 11:13:06 +00:00
Benjamin Berg	96fba323b9	meson: Fix linking issue of libfprint with newer gcc It appears the order of linking is relevant in this case, change it to fix some linking issues. It may be that there are better solutions to this problem.	2020-03-20 12:05:14 +01:00
Benjamin Berg	bd4f118b5e	ci: Update CI after the fdo template changes The CI definition needs to be updated to work with the new fdo templates.	2020-03-20 12:05:14 +01:00
Benjamin Berg	9d4b5ad682	Revert "ci: Fix CI syntax error" This reverts commit `bd500b2235`. The fix from the commit was not correct. See https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/124	2020-03-20 12:05:08 +01:00
Benjamin Berg	ca788b6de2	Revert "ci: Fix unknown keys in CI" This reverts commit `ebe5cb58ba`. The fix from the commit was not correct. See https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/124	2020-03-20 12:04:58 +01:00
Bastien Nocera	90ccf9a0af	vfs0050: Fix incorrect destructor for GError	2020-03-13 10:23:52 +01:00
Bastien Nocera	2581f1aa32	aes1610: Fix memory leak Fix small memory leak when reading some data that's not going to be processed.	2020-03-13 10:23:52 +01:00
Bastien Nocera	ebe5cb58ba	ci: Fix unknown keys in CI Fix: root config contains unknown keys: container_fedora_build	2020-03-13 10:14:59 +01:00
Bastien Nocera	bd500b2235	ci: Fix CI syntax error Fix CI syntax error: container_fedora_build: unknown keys in `extends` (.fedora@container-build) Caused by changes in the wayland CI templates: `4a73f030d0`	2020-03-13 10:08:58 +01:00
Bastien Nocera	8fa50d667c	ci: s/flatpack/flatpak/ “Flatpack” is for IKEA furniture.	2020-03-13 10:08:58 +01:00
Marco Trevisan (Treviño)	2ae8b74e60	meson: Add fpi-compat.h to the private headers	2020-02-27 06:03:21 +01:00
Benjamin Berg	f4ec816a6b	tests: Cast to correct pointer type rather than gpointer This is just a small cleanup	2020-02-19 16:42:30 +01:00
Benjamin Berg	9e2a7235e3	tests: Fix reading of gboolean into pointer Otherwise the payload will be lost later on when using GPOINTER_TO_INT to cast it back. See: #236	2020-02-19 16:42:30 +01:00