diff --git a/Makefile b/Makefile index f839f02a8..6ad742344 100644 --- a/Makefile +++ b/Makefile @@ -374,7 +374,7 @@ release: # - Removing -Werror... @find . \( -path "./Makefile.defs" -or -path "./client/Makefile" -or -path "./common_arm/Makefile.common" -or -path "./tools/hitag2crack/*/Makefile" -or -path "./client/deps/*/Makefile" \) -exec sed -i 's/ -Werror//' {} \; @find . \( -path "./client/deps/*.cmake" -or -path "./client/CMakeLists.txt" -or -path "./client/experimental_lib/CMakeLists.txt" \) -exec sed -i 's/ -Werror//' {} \; - # - Changing banner... + # - Changing banner... @sed -i "s/^#define BANNERMSG2 .*/#define BANNERMSG2 /" client/src/proxmark3.c @sed -i "s/^#define BANNERMSG3 .*/#define BANNERMSG3 \" Release... $(VERSION) - $(RELEASE_NAME)\"/" client/src/proxmark3.c @echo -n "# ";grep "^#define BANNERMSG2" client/src/proxmark3.c diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 7f3a2afc5..8f3469b4a 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -2956,7 +2956,7 @@ static void PacketReceived(PacketCommandNG *packet) { Dbprintf("reading flash memory failed with bytes between %d - %d", i, len); } isok = reply_old(CMD_FLASHMEM_DOWNLOADED, i, len, 0, mem, len); - + if (isok != PM3_SUCCESS) { Dbprintf("transfer to client failed with bytes between %d - %d", i, len); } @@ -2983,7 +2983,7 @@ static void PacketReceived(PacketCommandNG *packet) { FlashStop(); } - reply_ng(CMD_FLASHMEM_INFO, (isok) ? PM3_SUCCESS : PM3_EFLASH, (uint8_t*)info, sizeof(rdv40_validation_t)); + reply_ng(CMD_FLASHMEM_INFO, (isok) ? PM3_SUCCESS : PM3_EFLASH, (uint8_t *)info, sizeof(rdv40_validation_t)); BigBuf_free(); LED_B_OFF(); diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 7a664b820..cbcb6cfe0 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -3032,7 +3032,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) { char *copy = str_dup(getAtrInfo(sprint_hex_inrow(atr, atrLen))); char *token = strtok(copy, "\n"); while (token != NULL) { - PrintAndLogEx(INFO, " %s", token); + PrintAndLogEx(SUCCESS, " %s", token); token = strtok(NULL, "\n"); } free(copy); diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c index f90f01b55..737ce99ee 100644 --- a/client/src/cmdhf14b.c +++ b/client/src/cmdhf14b.c @@ -491,7 +491,7 @@ static int print_atqb_resp(uint8_t *data, uint8_t cid) { char *copy = str_dup(getAtrInfo(sprint_hex_inrow(atr, atrLen))); char *token = strtok(copy, "\n"); while (token != NULL) { - PrintAndLogEx(INFO, " %s", token); + PrintAndLogEx(SUCCESS, " %s", token); token = strtok(NULL, "\n"); } free(copy); diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 815072b7f..037e514e0 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -2503,7 +2503,7 @@ static int CmdHF14AMfUInfo(const char *Cmd) { if ((tagtype & (MFU_TT_UL_EV1_48 | MFU_TT_UL_EV1_128 | MFU_TT_UL_EV1 | MFU_TT_UL_NANO_40 | MFU_TT_NTAG_210u | MFU_TT_NTAG_213 | MFU_TT_NTAG_213_F | MFU_TT_NTAG_213_C | MFU_TT_NTAG_213_TT | MFU_TT_NTAG_215 | MFU_TT_NTAG_216 | MFU_TT_NTAG_216_F | - MFU_TT_NTAG_223_DNA | MFU_TT_NTAG_223_DNA_SD | MFU_TT_NTAG_224_DNA |MFU_TT_NTAG_224_DNA_SD | + MFU_TT_NTAG_223_DNA | MFU_TT_NTAG_223_DNA_SD | MFU_TT_NTAG_224_DNA | MFU_TT_NTAG_224_DNA_SD | MFU_TT_NTAG_I2C_1K | MFU_TT_NTAG_I2C_2K | MFU_TT_NTAG_I2C_1K_PLUS | MFU_TT_NTAG_I2C_2K_PLUS | MFU_TT_UL_AES))) { uint8_t ulev1_signature[48] = {0x00}; diff --git a/client/src/cmdlft55xx.c b/client/src/cmdlft55xx.c index 9b6062a2f..96fb52946 100644 --- a/client/src/cmdlft55xx.c +++ b/client/src/cmdlft55xx.c @@ -2755,7 +2755,7 @@ static int CmdT55xxRestore(const char *Cmd) { config.downlink_mode = downlink_mode; // Write the page 0 config - // + // // when running `lf t55xx dump` and user failed, the dump file will have a all zero block0 (ie: config block) // writing this bad config block will brick the tag. if (dump[0] != 0x00000000) { diff --git a/doc/commands.json b/doc/commands.json index fab9aadfe..0984c653a 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -12330,9 +12330,10 @@ "-s, --sign create a signature", "-d flash memory id, 8 hex bytes", "-p, --pem key in PEM format", - "-v, --verbose verbose output" + "-v, --verbose verbose output", + "-w, --write write signature to flash memory" ], - "usage": "mem info [-hsv] [-d ] [-p ]" + "usage": "mem info [-hsvw] [-d ] [-p ]" }, "mem load": { "command": "mem load", @@ -12537,7 +12538,7 @@ "offline": false, "options": [ "-h, --help This help", - "-p 0,1,2 page memory" + "-p page memory" ], "usage": "mem wipe [-h] [-p ]" }, @@ -13654,6 +13655,6 @@ "metadata": { "commands_extracted": 784, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2025-09-02T14:01:50" + "extracted_on": "2025-09-20T20:01:43" } }