From dc31b3a7fda38e60b4fbfc7c0794bf707722c4f6 Mon Sep 17 00:00:00 2001 From: douniwan5788 Date: Sat, 24 Aug 2024 14:32:06 +0800 Subject: [PATCH 1/2] fix: cast warning --- client/src/cmdlfem4x05.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c index b70eaf75a..2a1fcf387 100644 --- a/client/src/cmdlfem4x05.c +++ b/client/src/cmdlfem4x05.c @@ -941,7 +941,7 @@ static void em4x05_print_blocks(em_tech_type_t cardtype, uint8_t *data, uint8_t return; } - uint32_t *d = (uint32_t *)data; + uint32_t *d = (void *)data; uint8_t i; for (i = 0; i < (dlen >> 2); i++) { From b3db2e8bdea110625cf2dca325ed3b87fcebf464 Mon Sep 17 00:00:00 2001 From: douniwan5788 Date: Sat, 24 Aug 2024 14:42:03 +0800 Subject: [PATCH 2/2] fix: `lf em 410x clone` with SKIP_HITAG defined --- client/src/cmdlfem410x.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c index c22e3954d..171a14432 100644 --- a/client/src/cmdlfem410x.c +++ b/client/src/cmdlfem410x.c @@ -710,6 +710,11 @@ static int CmdEM410xClone(const char *Cmd) { return PM3_EINVARG; } + if (hs && IfPm3Hitag() == false) { + PrintAndLogEx(FAILED, "Device not compiled to support Hitag"); + return PM3_EINVARG; + } + // Allowed clock rates: 16, 32, 40 and 64 if ((clk != 16) && (clk != 32) && (clk != 64) && (clk != 40)) { PrintAndLogEx(FAILED, "supported clock rates are " _YELLOW_("16, 32, 40, 64") " got " _RED_("%d") "\n", clk);