From 79400d077957380541f7a4ee0cc50850f7a99a00 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 17 Jun 2025 18:24:40 +0200 Subject: [PATCH] text and style --- armsrc/mifarecmd.c | 4 ++-- armsrc/mifaresim.c | 19 ------------------- client/src/cmdhf14a.c | 9 ++++++--- client/src/cmdhficlass.c | 3 ++- client/src/cmdhfmf.c | 6 ++++-- client/src/cmdhfmfp.c | 2 +- client/src/cmdparser.c | 3 ++- client/src/crypto/libpcrypto.c | 6 ++++-- client/src/fileutils.c | 8 ++++---- client/src/mifare/mad.c | 1 - 10 files changed, 25 insertions(+), 36 deletions(-) diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index d0fe1e524..a84ad0096 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -274,7 +274,7 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes) { return; }; - if (!mifare_ultra_auth(keybytes)) { + if (mifare_ultra_auth(keybytes) == 0) { if (g_dbglevel >= DBG_ERROR) Dbprintf("Authentication failed"); OnError(1); return; @@ -304,7 +304,7 @@ void MifareUL_AES_Auth(bool turn_off_field, uint8_t keyno, uint8_t *keybytes) { return; }; - if (!mifare_ultra_aes_auth(keyno, keybytes)) { + if (mifare_ultra_aes_auth(keyno, keybytes) == 0) { if (g_dbglevel >= DBG_ERROR) Dbprintf("Authentication failed"); OnErrorNG(CMD_HF_MIFAREULAES_AUTH, PM3_ESOFT); return; diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c index 7b7a48550..21014be12 100644 --- a/armsrc/mifaresim.c +++ b/armsrc/mifaresim.c @@ -579,21 +579,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *uid, uint16_t counter++; } - /* - // find reader field - if (cardSTATE == MFEMUL_NOFIELD) { - - vHf = (MAX_ADC_HF_VOLTAGE * SumAdc(ADC_CHAN_HF, 32)) >> 15; - - if (vHf > MF_MINFIELDV) { - cardSTATE_TO_IDLE(); - LED_A_ON(); - } - button_pushed = BUTTON_PRESS(); - continue; - } - */ - FpgaEnableTracing(); //Now, get data int res = EmGetCmd(receivedCmd, sizeof(receivedCmd), &receivedCmd_len, receivedCmd_par); @@ -760,10 +745,6 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *uid, uint16_t // WORK case MFEMUL_WORK: { - if (g_dbglevel >= DBG_EXTENDED) { - // Dbprintf("[MFEMUL_WORK] Enter in case"); - } - if (receivedCmd_len == 0) { if (g_dbglevel >= DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] NO CMD received"); break; diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index e9319ec21..9d929b6b7 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -957,14 +957,17 @@ int CmdHF14ASim(const char *Cmd) { bool keypress = kbd_enter_pressed(); while (keypress == false) { - if (WaitForResponseTimeout(CMD_HF_MIFARE_SIMULATE, &resp, 1500) == false) + if (WaitForResponseTimeout(CMD_HF_MIFARE_SIMULATE, &resp, 1500) == false) { continue; + } - if (resp.status != PM3_SUCCESS) + if (resp.status != PM3_SUCCESS) { break; + } - if ((flags & FLAG_NR_AR_ATTACK) != FLAG_NR_AR_ATTACK) + if ((flags & FLAG_NR_AR_ATTACK) != FLAG_NR_AR_ATTACK) { break; + } const nonces_t *data = (nonces_t *)resp.data.asBytes; readerAttack(k_sector, k_sectors_cnt, data[0], setEmulatorMem, verbose); diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 4c945153e..0cf89a6d1 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -2130,8 +2130,9 @@ static int CmdHFiClassDump(const char *Cmd) { return PM3_EOPABORTED; } - if (WaitForResponseTimeout(CMD_HF_ICLASS_DUMP, &resp, 2000)) + if (WaitForResponseTimeout(CMD_HF_ICLASS_DUMP, &resp, 2000)) { break; + } } PrintAndLogEx(NORMAL, ""); diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 68a9eb044..21ccd12ae 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -3939,7 +3939,9 @@ static int CmdHF14AMfChk_fast(const char *Cmd) { PrintAndLogEx(NORMAL, ""); firstChunk = true; lastChunk = false; - if (blockn != -1) break; + if (blockn != -1) { + break; + } } // end strategy } out: @@ -5247,7 +5249,7 @@ int CmdHF14AMfELoad(const char *Cmd) { // update expected blocks to match converted data. block_cnt = bytes_read / MFU_BLOCK_SIZE; - PrintAndLogEx(INFO, "MIFARE Ultralight override, will use %d blocks ( %u bytes )", block_cnt, block_cnt * block_width); + PrintAndLogEx(INFO, "MIFARE Ultralight override, will use " _YELLOW_("%d") " blocks ( " _YELLOW_("%u") " bytes )", block_cnt, block_cnt * block_width); } PrintAndLogEx(INFO, "Uploading to emulator memory"); diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index 6007acf53..dc5684e43 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -315,7 +315,7 @@ static int mfp_load_keys(uint8_t **pkeyBlock, uint32_t *pkeycnt, uint8_t *userke int len = hex_to_bytes(g_mifare_plus_default_keys[cnt], (uint8_t *)(*pkeyBlock + (*pkeycnt + cnt) * AES_KEY_LEN), AES_KEY_LEN); - PrintAndLogEx(DEBUG, _YELLOW_("%2d") " - %s", *pkeycnt + cnt, sprint_hex_inrow(*pkeyBlock + (*pkeycnt + cnt) * AES_KEY_LEN, AES_KEY_LEN)); + PrintAndLogEx(DEBUG, _YELLOW_("%2u") " - %s", *pkeycnt + cnt, sprint_hex_inrow(*pkeyBlock + (*pkeycnt + cnt) * AES_KEY_LEN, AES_KEY_LEN)); if (len != AES_KEY_LEN) { break; } diff --git a/client/src/cmdparser.c b/client/src/cmdparser.c index 7421b3f58..cf6bb1941 100644 --- a/client/src/cmdparser.c +++ b/client/src/cmdparser.c @@ -287,8 +287,9 @@ int CmdsParse(const command_t Commands[], const char *Cmd) { } // Comment - if (cmd_name[0] == '#') + if (cmd_name[0] == '#') { return PM3_SUCCESS; + } // find args, check for -h / --help int tmplen = len; diff --git a/client/src/crypto/libpcrypto.c b/client/src/crypto/libpcrypto.c index 031005ce0..41f7574c5 100644 --- a/client/src/crypto/libpcrypto.c +++ b/client/src/crypto/libpcrypto.c @@ -55,13 +55,15 @@ void des_decrypt(void *out, const void *in, const void *key) { } void des_encrypt_ecb(void *out, const void *in, const int length, const void *key) { - for (int i = 0; i < length; i += 8) + for (int i = 0; i < length; i += 8) { des_encrypt((uint8_t *)out + i, (uint8_t *)in + i, key); + } } void des_decrypt_ecb(void *out, const void *in, const int length, const void *key) { - for (int i = 0; i < length; i += 8) + for (int i = 0; i < length; i += 8) { des_decrypt((uint8_t *)out + i, (uint8_t *)in + i, key); + } } void des_encrypt_cbc(void *out, const void *in, const int length, const void *key, uint8_t *iv) { diff --git a/client/src/fileutils.c b/client/src/fileutils.c index a9d7cd3af..aee5e827c 100644 --- a/client/src/fileutils.c +++ b/client/src/fileutils.c @@ -72,9 +72,7 @@ DumpFileType_t get_filetype(const char *filename) { size_t len = strlen(filename); if (len > 4) { // check if valid file extension and attempt to load data - char s[FILE_PATH_SIZE]; - memset(s, 0, sizeof(s)); - memcpy(s, filename, len); + char *s = str_dup(filename); str_lower(s); if (str_endswith(s, "bin")) { @@ -97,6 +95,8 @@ DumpFileType_t get_filetype(const char *filename) { // log is text // .pm3 is text values of signal data } + + free(s); } return o; } @@ -2577,7 +2577,7 @@ int detect_nfc_dump_format(const char *preferredName, nfc_df_e *dump_type, bool } FILE *f = fopen(path, "r"); - if (!f) { + if (f == NULL) { PrintAndLogEx(WARNING, "file not found or locked `" _YELLOW_("%s") "`", path); free(path); return PM3_EFILE; diff --git a/client/src/mifare/mad.c b/client/src/mifare/mad.c index d15b4f4b6..c72f33c1b 100644 --- a/client/src/mifare/mad.c +++ b/client/src/mifare/mad.c @@ -317,7 +317,6 @@ static int MADInfoByteDecode(const uint8_t *sector, bool swapmad, int mad_ver, b void MADPrintHeader(void) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "--- " _CYAN_("MIFARE App Directory Information") " ----------------"); - PrintAndLogEx(INFO, "-----------------------------------------------------"); } int MAD1DecodeAndPrint(uint8_t *sector, bool swapmad, bool verbose, bool *haveMAD2) {