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: Use FpiByteReader to compute the check bytes

Browse Source 
We can read the values in the proper format without having to
deal with endianness ourself, so let's do this instead of manual
labor.
This commit is contained in:
Marco Trevisan (Treviño)
2024-02-20 17:46:57 +01:00
parent e055781006
commit 666cd0c08d
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,28 +277,18 @@ egismoc_cmd_ssm_done (FpiSsm *ssm,
* should be 0, otherwise the device will reject the payload * should be 0, otherwise the device will reject the payload
*/ */
static guint16 static guint16
egismoc_get_check_bytes (const guchar *value, egismoc_get_check_bytes (FpiByteReader *reader)
const gsize value_length)
{ {
fp_dbg ("Get check bytes"); fp_dbg ("Get check bytes");
const size_t steps = (value_length + 1) / 2;
guint16 values[steps];
size_t sum_values = 0; size_t sum_values = 0;
guint16 val;
g_assert (value); fpi_byte_reader_set_pos (reader, 0);
for (int i = 0, j = 0; i < value_length; i += 2, j++) while (fpi_byte_reader_get_uint16_be (reader, &val))
{ sum_values += val;
values[j] = (value[i] << 8 & 0xff00);
if (i < value_length - 1) return G_MAXUINT16 - (sum_values % G_MAXUINT16);
values[j] |= value[i + 1] & 0x00ff;
}
for (int i = 0; i < steps; i++)
sum_values += values[i];
return 0xffff - (sum_values % 0xffff);
} }
static void static void
@@ -311,7 +301,6 @@ egismoc_exec_cmd (FpDevice *device,
g_auto(FpiByteWriter) writer = {0}; g_auto(FpiByteWriter) writer = {0};
g_autoptr(FpiUsbTransfer) transfer = NULL; g_autoptr(FpiUsbTransfer) transfer = NULL;
FpiDeviceEgisMoc *self = FPI_DEVICE_EGISMOC (device); FpiDeviceEgisMoc *self = FPI_DEVICE_EGISMOC (device);
const guint8 *buffer_out = NULL;
g_autofree CommandData *data = NULL; g_autofree CommandData *data = NULL;
gsize buffer_out_length = 0; gsize buffer_out_length = 0;
gboolean written = TRUE; gboolean written = TRUE;
@@ -331,7 +320,8 @@ egismoc_exec_cmd (FpDevice *device,
+ EGISMOC_CHECK_BYTES_LENGTH + EGISMOC_CHECK_BYTES_LENGTH
+ cmd_length; + cmd_length;
fpi_byte_writer_init_with_size (&writer, buffer_out_length, TRUE); fpi_byte_writer_init_with_size (&writer, buffer_out_length +
(buffer_out_length % 2 ? 1 : 0), TRUE);
/* Prefix */ /* Prefix */
written &= fpi_byte_writer_put_data (&writer, egismoc_write_prefix, written &= fpi_byte_writer_put_data (&writer, egismoc_write_prefix,
@@ -346,11 +336,7 @@ egismoc_exec_cmd (FpDevice *device,
/* Now fetch and set the "real" check bytes based on the currently /* Now fetch and set the "real" check bytes based on the currently
* assembled payload */ * assembled payload */
fpi_byte_reader_set_pos (FPI_BYTE_READER (&writer), 0); check_value = egismoc_get_check_bytes (FPI_BYTE_READER (&writer));
written &= fpi_byte_reader_peek_data (FPI_BYTE_READER (&writer),
buffer_out_length, &buffer_out);
check_value = egismoc_get_check_bytes (buffer_out, buffer_out_length);
fpi_byte_writer_set_pos (&writer, egismoc_write_prefix_len); fpi_byte_writer_set_pos (&writer, egismoc_write_prefix_len);
written &= fpi_byte_writer_put_uint16_be (&writer, check_value); written &= fpi_byte_writer_put_uint16_be (&writer, check_value);