From e4c641b708de0190c50a56e6bd79706706687dbf Mon Sep 17 00:00:00 2001 From: nemanjan00 Date: Mon, 7 Mar 2022 02:09:36 +0100 Subject: [PATCH 1/3] Add first and last block for READ_MULTI_BLOCK --- client/src/cmdhflist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c index 557c563d1..5d6fcbd9b 100644 --- a/client/src/cmdhflist.c +++ b/client/src/cmdhflist.c @@ -553,7 +553,7 @@ void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) { snprintf(exp, size, "LOCKBLOCK"); return; case ISO15693_READ_MULTI_BLOCK: - snprintf(exp, size, "READ_MULTI_BLOCK"); + snprintf(exp, size, "READ_MULTI_BLOCK(%d-%d)", cmd[2], (cmd[2] + cmd[3])); return; case ISO15693_WRITE_MULTI_BLOCK: snprintf(exp, size, "WRITE_MULTI_BLOCK"); From 24d3094012ecc38c3a37b4a5dcf368b5525b515c Mon Sep 17 00:00:00 2001 From: nemanjan00 Date: Mon, 21 Mar 2022 21:34:38 +0100 Subject: [PATCH 2/3] Check cmd size --- client/src/cmdhflist.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c index 5d6fcbd9b..aee2370d3 100644 --- a/client/src/cmdhflist.c +++ b/client/src/cmdhflist.c @@ -553,7 +553,11 @@ void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) { snprintf(exp, size, "LOCKBLOCK"); return; case ISO15693_READ_MULTI_BLOCK: - snprintf(exp, size, "READ_MULTI_BLOCK(%d-%d)", cmd[2], (cmd[2] + cmd[3])); + if (cmdsize == 6) { + snprintf(exp, size, "READ_MULTI_BLOCK(%d-%d)", cmd[2], (cmd[2] + cmd[3])); + } else { + snprintf(exp, size, "READ_MULTI_BLOCK"); + } return; case ISO15693_WRITE_MULTI_BLOCK: snprintf(exp, size, "WRITE_MULTI_BLOCK"); From 5c9693529c2d4e3d9a9ffc7d14983a52d3505f39 Mon Sep 17 00:00:00 2001 From: nemanjan00 Date: Tue, 22 Mar 2022 00:55:37 +0100 Subject: [PATCH 3/3] Get output with UID --- client/src/cmdhflist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c index aee2370d3..ae3f2fb81 100644 --- a/client/src/cmdhflist.c +++ b/client/src/cmdhflist.c @@ -556,7 +556,7 @@ void annotateIso15693(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) { if (cmdsize == 6) { snprintf(exp, size, "READ_MULTI_BLOCK(%d-%d)", cmd[2], (cmd[2] + cmd[3])); } else { - snprintf(exp, size, "READ_MULTI_BLOCK"); + snprintf(exp, size, "READ_MULTI_BLOCK(%d-%d)", cmd[10], (cmd[10] + cmd[11])); } return; case ISO15693_WRITE_MULTI_BLOCK: