Skip to content

Commit 02e0532

Browse files
mpi3dmpi3d
committed
Removed "R" after PSK
1 parent 6e502ae commit 02e0532

File tree

7 files changed

+84
-88
lines changed

7 files changed

+84
-88
lines changed

‎libfprint/drivers/goodixtls/goodix.c‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,12 @@ void goodix_receive_reset(FpDevice *dev, guint8 *data, guint16 length,
146146
cb_info->user_data, NULL);
147147
}
148148

149-
void goodix_receive_preset_psk_read_r(FpDevice *dev, guint8 *data,
150-
guint16 length, gpointer user_data,
151-
GError *error) {
152-
guint32 psk_r_len;
149+
void goodix_receive_preset_psk_read(FpDevice *dev, guint8 *data, guint16 length,
150+
gpointer user_data, GError *error) {
151+
guint32 psk_len;
153152
g_autofree GoodixCallbackInfo *cb_info = user_data;
154-
GoodixPresetPskReadRCallback callback =
155-
(GoodixPresetPskReadRCallback)cb_info->callback;
153+
GoodixPresetPskReadCallback callback =
154+
(GoodixPresetPskReadCallback)cb_info->callback;
156155

157156
if (error) {
158157
callback(dev, FALSE, 0x00000000, NULL, 0, cb_info->user_data, error);
@@ -161,7 +160,7 @@ void goodix_receive_preset_psk_read_r(FpDevice *dev, guint8 *data,
161160

162161
if (length < sizeof(guint8)) {
163162
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
164-
"Invalid preset PSK read R reply length: %d", length);
163+
"Invalid preset PSK read reply length: %d", length);
165164
callback(dev, FALSE, 0x00000000, NULL, 0, cb_info->user_data, error);
166165
return;
167166
}
@@ -171,33 +170,32 @@ void goodix_receive_preset_psk_read_r(FpDevice *dev, guint8 *data,
171170
return;
172171
}
173172

174-
if (length < sizeof(guint8) + sizeof(GoodixPresetPskR)) {
173+
if (length < sizeof(guint8) + sizeof(GoodixPresetPsk)) {
175174
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
176-
"Invalid preset PSK read R reply length: %d", length);
175+
"Invalid preset PSK read reply length: %d", length);
177176
callback(dev, FALSE, 0x00000000, NULL, 0, cb_info->user_data, error);
178177
return;
179178
}
180179

181-
psk_r_len =
182-
GUINT32_FROM_LE(((GoodixPresetPskR *)(data + sizeof(guint8)))->length);
180+
psk_len =
181+
GUINT32_FROM_LE(((GoodixPresetPsk *)(data + sizeof(guint8)))->length);
183182

184-
if (length < psk_r_len + sizeof(guint8) + sizeof(GoodixPresetPskR)) {
183+
if (length < psk_len + sizeof(guint8) + sizeof(GoodixPresetPsk)) {
185184
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
186-
"Invalid preset PSK read R reply length: %d", length);
185+
"Invalid preset PSK read reply length: %d", length);
187186
callback(dev, FALSE, 0x00000000, NULL, 0, cb_info->user_data, error);
188187
return;
189188
}
190189

191-
callback(
192-
dev, TRUE,
193-
GUINT32_FROM_LE(((GoodixPresetPskR *)(data + sizeof(guint8)))->flags),
194-
data + sizeof(guint8) + sizeof(GoodixPresetPskR), psk_r_len,
195-
cb_info->user_data, NULL);
190+
callback(dev, TRUE,
191+
GUINT32_FROM_LE(((GoodixPresetPsk *)(data + sizeof(guint8)))->flags),
192+
data + sizeof(guint8) + sizeof(GoodixPresetPsk), psk_len,
193+
cb_info->user_data, NULL);
196194
}
197195

198-
void goodix_receive_preset_psk_write_r(FpDevice *dev, guint8 *data,
199-
guint16 length, gpointer user_data,
200-
GError *error) {
196+
void goodix_receive_preset_psk_write(FpDevice *dev, guint8 *data,
197+
guint16 length, gpointer user_data,
198+
GError *error) {
201199
g_autofree GoodixCallbackInfo *cb_info = user_data;
202200
GoodixSuccessCallback callback = (GoodixSuccessCallback)cb_info->callback;
203201

@@ -208,7 +206,7 @@ void goodix_receive_preset_psk_write_r(FpDevice *dev, guint8 *data,
208206

209207
if (length < sizeof(guint8)) {
210208
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
211-
"Invalid preset PSK write R reply length: %d", length);
209+
"Invalid preset PSK write reply length: %d", length);
212210
callback(dev, FALSE, cb_info->user_data, error);
213211
return;
214212
}
@@ -873,43 +871,43 @@ void goodix_send_tls_successfully_established(FpDevice *dev,
873871
GOODIX_TIMEOUT, FALSE, NULL, NULL);
874872
}
875873

876-
void goodix_send_preset_psk_write_r(FpDevice *dev, guint32 flags, guint8 *psk_r,
877-
guint16 length, GDestroyNotify free_func,
878-
GoodixSuccessCallback callback,
879-
gpointer user_data) {
874+
void goodix_send_preset_psk_write(FpDevice *dev, guint32 flags, guint8 *psk,
875+
guint16 length, GDestroyNotify free_func,
876+
GoodixSuccessCallback callback,
877+
gpointer user_data) {
880878
// Only support one flags, one payload and one length
881879

882-
guint8 *payload = g_malloc(sizeof(GoodixPresetPskR) + length);
883-
GoodixPresetPskR *preset_psk_r = (GoodixPresetPskR *)payload;
880+
guint8 *payload = g_malloc(sizeof(GoodixPresetPsk) + length);
881+
GoodixPresetPsk *preset_psk = (GoodixPresetPsk *)payload;
884882
GoodixCallbackInfo *cb_info;
885883

886-
preset_psk_r->flags = GUINT32_TO_LE(flags);
887-
preset_psk_r->length = GUINT32_TO_LE(length);
888-
memcpy(payload + sizeof(GoodixPresetPskR), psk_r, length);
889-
if (free_func) free_func(psk_r);
884+
preset_psk->flags = GUINT32_TO_LE(flags);
885+
preset_psk->length = GUINT32_TO_LE(length);
886+
memcpy(payload + sizeof(GoodixPresetPsk), psk, length);
887+
if (free_func) free_func(psk);
890888

891889
if (callback) {
892890
cb_info = malloc(sizeof(GoodixCallbackInfo));
893891

894892
cb_info->callback = G_CALLBACK(callback);
895893
cb_info->user_data = user_data;
896894

897-
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_WRITE_R, payload,
895+
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_WRITE, payload,
898896
sizeof(payload) + length, g_free, TRUE, GOODIX_TIMEOUT,
899-
TRUE, goodix_receive_preset_psk_write_r, cb_info);
897+
TRUE, goodix_receive_preset_psk_write, cb_info);
900898
return;
901899
}
902900

903-
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_WRITE_R, payload,
901+
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_WRITE, payload,
904902
sizeof(payload) + length, g_free, TRUE, GOODIX_TIMEOUT,
905903
TRUE, NULL, NULL);
906904
}
907905

908-
void goodix_send_preset_psk_read_r(FpDevice *dev, guint32 flags, guint16 length,
909-
GoodixPresetPskReadRCallback callback,
910-
gpointer user_data) {
911-
GoodixPresetPskR payload = {.flags = GUINT32_TO_LE(flags),
912-
.length = GUINT32_TO_LE(length)};
906+
void goodix_send_preset_psk_read(FpDevice *dev, guint32 flags, guint16 length,
907+
GoodixPresetPskReadCallback callback,
908+
gpointer user_data) {
909+
GoodixPresetPsk payload = {.flags = GUINT32_TO_LE(flags),
910+
.length = GUINT32_TO_LE(length)};
913911
GoodixCallbackInfo *cb_info;
914912

915913
if (callback) {
@@ -918,13 +916,13 @@ void goodix_send_preset_psk_read_r(FpDevice *dev, guint32 flags, guint16 length,
918916
cb_info->callback = G_CALLBACK(callback);
919917
cb_info->user_data = user_data;
920918

921-
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_READ_R, (guint8 *)&payload,
919+
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_READ, (guint8 *)&payload,
922920
sizeof(payload), NULL, TRUE, GOODIX_TIMEOUT, TRUE,
923-
goodix_receive_preset_psk_read_r, cb_info);
921+
goodix_receive_preset_psk_read, cb_info);
924922
return;
925923
}
926924

927-
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_READ_R, (guint8 *)&payload,
925+
goodix_send_protocol(dev, GOODIX_CMD_PRESET_PSK_READ, (guint8 *)&payload,
928926
sizeof(payload), NULL, TRUE, GOODIX_TIMEOUT, TRUE, NULL,
929927
NULL);
930928
}

‎libfprint/drivers/goodixtls/goodix.h‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ typedef void (*GoodixFirmwareVersionCallback)(FpDevice *dev, gchar *firmware,
4747
gpointer user_data,
4848
GError *error);
4949

50-
typedef void (*GoodixPresetPskReadRCallback)(FpDevice *dev, gboolean success,
51-
guint32 flags, guint8 *psk_r,
52-
guint16 length, gpointer user_data,
53-
GError *error);
50+
typedef void (*GoodixPresetPskReadCallback)(FpDevice *dev, gboolean success,
51+
guint32 flags, guint8 *psk,
52+
guint16 length, gpointer user_data,
53+
GError *error);
5454

5555
typedef void (*GoodixSuccessCallback)(FpDevice *dev, gboolean success,
5656
gpointer user_data, GError *error);
@@ -85,13 +85,12 @@ void goodix_receive_none(FpDevice *dev, guint8 *data, guint16 length,
8585
void goodix_receive_default(FpDevice *dev, guint8 *data, guint16 length,
8686
gpointer user_data, GError *error);
8787

88-
void goodix_receive_preset_psk_read_r(FpDevice *dev, guint8 *data,
89-
guint16 length, gpointer user_data,
90-
GError *error);
88+
void goodix_receive_preset_psk_read(FpDevice *dev, guint8 *data, guint16 length,
89+
gpointer user_data, GError *error);
9190

92-
void goodix_receive_preset_psk_write_r(FpDevice *dev, guint8 *data,
93-
guint16 length, gpointer user_data,
94-
GError *error);
91+
void goodix_receive_preset_psk_write(FpDevice *dev, guint8 *data,
92+
guint16 length, gpointer user_data,
93+
GError *error);
9594

9695
void goodix_receive_ack(FpDevice *dev, guint8 *data, guint16 length,
9796
gpointer user_data, GError *error);
@@ -201,14 +200,14 @@ void goodix_send_tls_successfully_established(FpDevice *dev,
201200
GoodixNoneCallback callback,
202201
gpointer user_data);
203202

204-
void goodix_send_preset_psk_write_r(FpDevice *dev, guint32 flags, guint8 *psk_r,
205-
guint16 length, GDestroyNotify free_func,
206-
GoodixSuccessCallback callback,
207-
gpointer user_data);
203+
void goodix_send_preset_psk_write(FpDevice *dev, guint32 flags, guint8 *psk,
204+
guint16 length, GDestroyNotify free_func,
205+
GoodixSuccessCallback callback,
206+
gpointer user_data);
208207

209-
void goodix_send_preset_psk_read_r(FpDevice *dev, guint32 flags, guint16 length,
210-
GoodixPresetPskReadRCallback callback,
211-
gpointer user_data);
208+
void goodix_send_preset_psk_read(FpDevice *dev, guint32 flags, guint16 length,
209+
GoodixPresetPskReadCallback callback,
210+
gpointer user_data);
212211

213212
// ---- GOODIX SEND SECTION END ----
214213

‎libfprint/drivers/goodixtls/goodix511.c‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@ static void check_reset(FpDevice *dev, gboolean success, guint16 number,
107107
fpi_ssm_next_state(user_data);
108108
}
109109

110-
static void check_preset_psk_read_r(FpDevice *dev, gboolean success,
111-
guint32 flags, guint8 *psk_r,
112-
guint16 length, gpointer user_data,
113-
GError *error) {
114-
g_autofree gchar *psk_r_str = data_to_str(psk_r, length);
110+
static void check_preset_psk_read(FpDevice *dev, gboolean success,
111+
guint32 flags, guint8 *psk, guint16 length,
112+
gpointer user_data, GError *error) {
113+
g_autofree gchar *psk_str = data_to_str(psk, length);
115114

116115
if (error) {
117116
fpi_ssm_mark_failed(user_data, error);
@@ -120,31 +119,31 @@ static void check_preset_psk_read_r(FpDevice *dev, gboolean success,
120119

121120
if (!success) {
122121
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_FAILED,
123-
"Failed to read PSK R from device");
122+
"Failed to read PSK from device");
124123
fpi_ssm_mark_failed(user_data, error);
125124
return;
126125
}
127126

128-
fp_dbg("Device PSK R: 0x%s", psk_r_str);
129-
fp_dbg("Device PSK R flags: 0x%08x", flags);
127+
fp_dbg("Device PSK: 0x%s", psk_str);
128+
fp_dbg("Device PSK flags: 0x%08x", flags);
130129

131-
if (flags != GOODIX_511_PSK_R_FLAGS) {
130+
if (flags != GOODIX_511_PSK_FLAGS) {
132131
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
133-
"Invalid device PSK R flags: 0x%08x", flags);
132+
"Invalid device PSK flags: 0x%08x", flags);
134133
fpi_ssm_mark_failed(user_data, error);
135134
return;
136135
}
137136

138-
if (length != sizeof(goodix_511_psk_r_0)) {
137+
if (length != sizeof(goodix_511_psk_0)) {
139138
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
140-
"Invalid device PSK R: 0x%s", psk_r_str);
139+
"Invalid device PSK: 0x%s", psk_str);
141140
fpi_ssm_mark_failed(user_data, error);
142141
return;
143142
}
144143

145-
if (memcmp(psk_r, goodix_511_psk_r_0, sizeof(goodix_511_psk_r_0))) {
144+
if (memcmp(psk, goodix_511_psk_0, sizeof(goodix_511_psk_0))) {
146145
g_set_error(&error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA,
147-
"Invalid device PSK R: 0x%s", psk_r_str);
146+
"Invalid device PSK: 0x%s", psk_str);
148147
fpi_ssm_mark_failed(user_data, error);
149148
return;
150149
}
@@ -176,8 +175,8 @@ static void activate_run_state(FpiSsm *ssm, FpDevice *dev) {
176175
break;
177176

178177
case ACTIVATE_CHECK_PSK:
179-
goodix_send_preset_psk_read_r(dev, GOODIX_511_PSK_R_FLAGS, 0,
180-
check_preset_psk_read_r, ssm);
178+
goodix_send_preset_psk_read(dev, GOODIX_511_PSK_FLAGS, 0,
179+
check_preset_psk_read, ssm);
181180
break;
182181

183182
case ACTIVATE_RESET:

‎libfprint/drivers/goodixtls/goodix511.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
#define GOODIX_511_FIRMWARE_VERSION ("GF_ST411SEC_APP_12109")
2727

28-
#define GOODIX_511_PSK_R_FLAGS (0xbb020003)
28+
#define GOODIX_511_PSK_FLAGS (0xbb020003)
2929

3030
#define GOODIX_511_RESET_NUMBER (2048)
3131

32-
const guint8 goodix_511_psk_r_0[] = {
32+
const guint8 goodix_511_psk_0[] = {
3333
0xba, 0x1a, 0x86, 0x03, 0x7c, 0x1d, 0x3c, 0x71, 0xc3, 0xaf, 0x34,
3434
0x49, 0x55, 0xbd, 0x69, 0xa9, 0xa9, 0x86, 0x1d, 0x9e, 0x91, 0x1f,
3535
0xa2, 0x49, 0x85, 0xb6, 0x77, 0xe8, 0xdb, 0xd7, 0x2d, 0x43};

‎libfprint/drivers/goodixtls/goodix_proto.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
#define GOODIX_CMD_ACK (0xb0)
4747
#define GOODIX_CMD_REQUEST_TLS_CONNECTION (0xd0)
4848
#define GOODIX_CMD_TLS_SUCCESSFULLY_ESTABLISHED (0xd4)
49-
#define GOODIX_CMD_PRESET_PSK_WRITE_R (0xe0)
50-
#define GOODIX_CMD_PRESET_PSK_READ_R (0xe4)
49+
#define GOODIX_CMD_PRESET_PSK_WRITE (0xe0)
50+
#define GOODIX_CMD_PRESET_PSK_READ (0xe4)
5151

5252
typedef struct __attribute__((__packed__)) _GoodixPack {
5353
guint8 flags;
@@ -108,10 +108,10 @@ typedef struct __attribute__((__packed__)) _GoodixQueryMcuState {
108108
guint8 unused_flags;
109109
} GoodixQueryMcuState;
110110

111-
typedef struct __attribute__((__packed__)) _GoodixPresetPskR {
111+
typedef struct __attribute__((__packed__)) _GoodixPresetPsk {
112112
guint32 flags;
113113
guint32 length;
114-
} GoodixPresetPskR;
114+
} GoodixPresetPsk;
115115

116116
typedef struct __attribute__((__packed__)) _GoodixDefault {
117117
guint8 unused_flags;

‎libfprint/drivers/goodixtls/goodixtls.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ SSL_CTX *ctx;
3939

4040
static unsigned int tls_server_psk_server_callback(SSL *ssl,
4141
const char *identity,
42-
unsigned char *psk_r,
43-
unsigned int max_psk_r_len) {
44-
if (sizeof(goodix_511_psk_r_0) > max_psk_r_len) {
42+
unsigned char *psk,
43+
unsigned int max_psk_len) {
44+
if (sizeof(goodix_511_psk_0) > max_psk_len) {
4545
fp_dbg("Provided PSK R is too long for OpenSSL");
4646
return 0;
4747
}
4848

49-
psk_r = (unsigned char *)&goodix_511_psk_r_0;
49+
psk = (unsigned char *)&goodix_511_psk_0;
5050

51-
return sizeof(goodix_511_psk_r_0);
51+
return sizeof(goodix_511_psk_0);
5252
}
5353

5454
int tls_server_create_socket(int port) {

‎libfprint/drivers/goodixtls/goodixtls.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#define GOODIX_TLS_SERVER_PORT 4433
2323

24-
static const guint8 goodix_511_psk_r_0[] = {
24+
static const guint8 goodix_511_psk_0[] = {
2525
0xba, 0x1a, 0x86, 0x03, 0x7c, 0x1d, 0x3c, 0x71, 0xc3, 0xaf, 0x34,
2626
0x49, 0x55, 0xbd, 0x69, 0xa9, 0xa9, 0x86, 0x1d, 0x9e, 0x91, 0x1f,
2727
0xa2, 0x49, 0x85, 0xb6, 0x77, 0xe8, 0xdb, 0xd7, 0x2d, 0x43};

0 commit comments

Comments
 (0)