From 17ddc2db82a31d8055654ebd70e26d486f5b8b41 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 3 Sep 2024 23:00:50 +0200 Subject: [PATCH] trying to please codeQL --- armsrc/mifarecmd.c | 2 +- client/src/cmdhfmf.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 6079e12d1..f2b669593 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -1111,7 +1111,7 @@ void MifareAcquireStaticEncryptedNonces(uint32_t flags, uint8_t *key) { }; if (with_data) { uint8_t data[16]; - for (uint8_t tb = blockNo; tb < blockNo + 4; tb++) { + for (uint16_t tb = blockNo; tb < blockNo + 4; tb++) { memset(data, 0x00, sizeof(data)); int res = mifare_classic_readblock(pcs, tb, data); if (res == 1) { diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 4ac174cf3..3c65007c8 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -9858,15 +9858,15 @@ static int CmdHF14AMfISEN(const char *Cmd) { PrintAndLogEx(NORMAL, "[\n ["); for (uint8_t sec = 0; sec < num_sectors; sec++) { PrintAndLogEx(NORMAL, " [\"%08x\", \"%08x\"]%s", - bytes_to_num(resp.data.asBytes + ((sec * 2) * 9), 4), - bytes_to_num(resp.data.asBytes + (((sec * 2) + 1) * 9), 4), + (uint32_t) bytes_to_num(resp.data.asBytes + ((sec * 2) * 9), 4), + (uint32_t) bytes_to_num(resp.data.asBytes + (((sec * 2) + 1) * 9), 4), sec < num_sectors - 1 ? "," : ""); } PrintAndLogEx(NORMAL, " ],\n ["); for (uint8_t sec = 0; sec < num_sectors; sec++) { PrintAndLogEx(NORMAL, " [\"%08x\", \"%08x\"]%s", - bytes_to_num(resp.data.asBytes + ((sec * 2) * 9) + 4, 4), - bytes_to_num(resp.data.asBytes + (((sec * 2) + 1) * 9) + 4, 4), + (uint32_t) bytes_to_num(resp.data.asBytes + ((sec * 2) * 9) + 4, 4), + (uint32_t) bytes_to_num(resp.data.asBytes + (((sec * 2) + 1) * 9) + 4, 4), sec < num_sectors - 1 ? "," : ""); } PrintAndLogEx(NORMAL, " ],\n [");