depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

uru4000: Always detect whether encryption is in use

Browse source 
This is based on the patch and observation from Bastien that some
URU4000B devices do not use encryption by default (it is a configuration
stored within the firmware). As such, it makes sense to always detect
whether encryption is in use by inspecting the image.

The encryption option would disable flipping of the image for the
URU400B device. Retain this behaviour for backward compatibility.
This commit is contained in:
Benjamin Berg 2020-04-22 18:24:09 +02:00 committed by Benjamin Berg
parent 24b1faffde
commit 4af3e59174
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libfprint/drivers/uru4000.c
View file

@ -81,7 +81,7 @@ static const struct uru4k_dev_profile
{ {
const char *name; const char *name;
gboolean auth_cr; gboolean auth_cr;
gboolean encryption; gboolean image_not_flipped;
} uru4k_dev_info[] = { } uru4k_dev_info[] = {
[MS_KBD] = { [MS_KBD] = {
.name = "Microsoft Keyboard with Fingerprint Reader", .name = "Microsoft Keyboard with Fingerprint Reader",
@ -106,7 +106,7 @@ static const struct uru4k_dev_profile
[DP_URU4000B] = { [DP_URU4000B] = {
.name = "Digital Persona U.are.U 4000B", .name = "Digital Persona U.are.U 4000B",
.auth_cr = FALSE, .auth_cr = FALSE,
.encryption = TRUE, .image_not_flipped = TRUE, /* See comment in the code where it is used. */
}, },
}; };
@ -680,17 +680,17 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
fpi_ssm_jump_to_state (ssm, IMAGING_CAPTURE); fpi_ssm_jump_to_state (ssm, IMAGING_CAPTURE);
return; return;
} }
if (!self->profile->encryption)
/* Detect whether image is encrypted (by checking how noisy it is) */
dev2 = calc_dev2 (img);
fp_dbg ("dev2: %d", dev2);
if (dev2 < ENC_THRESHOLD)
{ {
dev2 = calc_dev2 (img); fpi_ssm_jump_to_state (ssm, IMAGING_REPORT_IMAGE);
fp_dbg ("dev2: %d", dev2); return;
if (dev2 < ENC_THRESHOLD)
{
fpi_ssm_jump_to_state (ssm, IMAGING_REPORT_IMAGE);
return;
}
fp_info ("image seems to be encrypted");
} }
fp_info ("image seems to be encrypted");
buf[0] = img->key_number; buf[0] = img->key_number;
buf[1] = self->img_enc_seed; buf[1] = self->img_enc_seed;
buf[2] = self->img_enc_seed >> 8; buf[2] = self->img_enc_seed >> 8;
@ -769,7 +769,13 @@ imaging_run_state (FpiSsm *ssm, FpDevice *_dev)
} }
fpimg->flags = FPI_IMAGE_COLORS_INVERTED; fpimg->flags = FPI_IMAGE_COLORS_INVERTED;
if (!self->profile->encryption) /* NOTE: For some reason all but U4000B (or rather U4500?) flipped the
* image, we retain this behaviour here, but it is not clear whether it
* is correct.
* It may be that there are different models with the same USB ID that
* behave differently.
*/
if (self->profile->image_not_flipped)
fpimg->flags |= FPI_IMAGE_V_FLIPPED | FPI_IMAGE_H_FLIPPED; fpimg->flags |= FPI_IMAGE_V_FLIPPED | FPI_IMAGE_H_FLIPPED;
fpi_image_device_image_captured (dev, fpimg); fpi_image_device_image_captured (dev, fpimg);