mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

egismoc: Add support for usernames longer than 8 chars

Browse Source
This commit is contained in:
Joshua Grisham
2023-10-20 19:54:23 +02:00
committed by Marco Trevisan (Treviño)
parent a9269980eb
commit 7aae2181e2
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libfprint/drivers/egismoc/egismoc.c
View File

@@ -350,16 +350,26 @@ egismoc_exec_cmd (FpDevice *device,
static void static void
egismoc_set_print_data (FpPrint *print, egismoc_set_print_data (FpPrint *print,
const guchar *device_print_id) const guchar *device_print_id,
const gchar *user_id)
{ {
g_autofree gchar *user_id = g_malloc (EGISMOC_FINGERPRINT_DATA_SIZE + 1);
GVariant *print_id_var = NULL; GVariant *print_id_var = NULL;
GVariant *fpi_data = NULL; GVariant *fpi_data = NULL;
g_autofree gchar *fill_user_id = NULL;
memcpy (user_id, device_print_id, EGISMOC_FINGERPRINT_DATA_SIZE); if (user_id)
memset (user_id + EGISMOC_FINGERPRINT_DATA_SIZE, '\0', sizeof (gchar)); {
fill_user_id = g_strdup (user_id);
}
else
{
fill_user_id = g_malloc0 (EGISMOC_FINGERPRINT_DATA_SIZE + 1);
memcpy (fill_user_id, device_print_id, EGISMOC_FINGERPRINT_DATA_SIZE);
memset (fill_user_id + EGISMOC_FINGERPRINT_DATA_SIZE, '\0', sizeof (gchar));
}
fpi_print_fill_from_user_id (print, fill_user_id);
fpi_print_fill_from_user_id (print, user_id);
fpi_print_set_type (print, FPI_PRINT_RAW); fpi_print_set_type (print, FPI_PRINT_RAW);
fpi_print_set_device_stored (print, TRUE); fpi_print_set_device_stored (print, TRUE);
@@ -384,7 +394,7 @@ egismoc_get_enrolled_prints (FpDevice *device)
for (int i = 0; i < self->enrolled_num; i++) for (int i = 0; i < self->enrolled_num; i++)
{ {
print = fp_print_new (device); print = fp_print_new (device);
egismoc_set_print_data (print, g_ptr_array_index (self->enrolled_ids, i)); egismoc_set_print_data (print, g_ptr_array_index (self->enrolled_ids, i), NULL);
g_ptr_array_add (result, g_object_ref_sink (print)); g_ptr_array_add (result, g_object_ref_sink (print));
} }
@@ -990,7 +1000,7 @@ egismoc_enroll_run_state (FpiSsm *ssm,
device_print_id = g_malloc0 (EGISMOC_FINGERPRINT_DATA_SIZE); device_print_id = g_malloc0 (EGISMOC_FINGERPRINT_DATA_SIZE);
memcpy (device_print_id, user_id, MIN (strlen (user_id), EGISMOC_FINGERPRINT_DATA_SIZE)); memcpy (device_print_id, user_id, MIN (strlen (user_id), EGISMOC_FINGERPRINT_DATA_SIZE));
egismoc_set_print_data (enroll_print->print, device_print_id); egismoc_set_print_data (enroll_print->print, device_print_id, user_id);
/* create new dynamic payload of cmd_new_print_prefix + device_print_id */ /* create new dynamic payload of cmd_new_print_prefix + device_print_id */
payload_length = cmd_new_print_prefix_len + EGISMOC_FINGERPRINT_DATA_SIZE; payload_length = cmd_new_print_prefix_len + EGISMOC_FINGERPRINT_DATA_SIZE;
@@ -1066,9 +1076,9 @@ egismoc_identify_check_cb (FpDevice *device,
buffer_in + EGISMOC_IDENTIFY_RESPONSE_PRINT_ID_OFFSET, buffer_in + EGISMOC_IDENTIFY_RESPONSE_PRINT_ID_OFFSET,
EGISMOC_FINGERPRINT_DATA_SIZE); EGISMOC_FINGERPRINT_DATA_SIZE);
/* Create a new print from this ID and then see if it matches the one indicated */ /* Create a new print from this device_print_id and then see if it matches the one indicated */
print = fp_print_new (device); print = fp_print_new (device);
egismoc_set_print_data (print, device_print_id); egismoc_set_print_data (print, device_print_id, NULL);
if (!print) if (!print)
{ {