diff --git a/client/src/cmddata.c b/client/src/cmddata.c index b0765ae0b..f20b9e670 100644 --- a/client/src/cmddata.c +++ b/client/src/cmddata.c @@ -1866,7 +1866,7 @@ int getSamplesEx(uint32_t start, uint32_t end, bool verbose, bool ignore_lf_conf PacketResponseNG resp; if (GetFromDevice(BIG_BUF, got, n, start, NULL, 0, &resp, 10000, true) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdflashmem.c b/client/src/cmdflashmem.c index dbb030bf8..f2237cf2a 100644 --- a/client/src/cmdflashmem.c +++ b/client/src/cmdflashmem.c @@ -349,7 +349,7 @@ static int CmdFlashMemLoad(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_FLASHMEM_WRITE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); g_conn.block_after_ACK = false; free(data); return PM3_ETIMEOUT; @@ -473,7 +473,7 @@ static int CmdFlashMemWipe(const char *Cmd) { SendCommandMIX(CMD_FLASHMEM_WIPE, page, initialwipe, 0, NULL, 0); PacketResponseNG resp; if (!WaitForResponseTimeout(CMD_ACK, &resp, 10000)) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c index fef35bb4d..4f8cf90d6 100644 --- a/client/src/cmdflashmemspiffs.c +++ b/client/src/cmdflashmemspiffs.c @@ -69,7 +69,7 @@ int flashmem_spiffs_load(const char *destfn, const uint8_t *data, size_t datalen uint8_t retry = 3; while (WaitForResponseTimeout(CMD_SPIFFS_WRITE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); retry--; if (retry == 0) { ret_val = PM3_ETIMEOUT; @@ -96,7 +96,7 @@ int flashmem_spiffs_download(char *fn, uint8_t fnlen, void **pdest, size_t *dest SendCommandNG(CMD_SPIFFS_STAT, (uint8_t *)fn, fnlen); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_SPIFFS_STAT, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -401,7 +401,7 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) { SendCommandNG(CMD_SPIFFS_STAT, (uint8_t *)src, slen); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_SPIFFS_STAT, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c index ae5f8b845..350299211 100644 --- a/client/src/cmdhf.c +++ b/client/src/cmdhf.c @@ -526,7 +526,7 @@ int handle_hf_plot(bool show_plot) { PacketResponseNG resp; if (GetFromDevice(FPGA_MEM, buf, FPGA_TRACE_SIZE, 0, NULL, 0, &resp, 4000, true) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 1a694bc49..201cc95da 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -498,7 +498,7 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -806,7 +806,7 @@ static int CmdHF14ACUIDs(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1670,7 +1670,7 @@ static int waitCmd(bool i_select, uint32_t timeout, bool verbose) { } } else { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } return PM3_SUCCESS; @@ -2264,7 +2264,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) { clearCommandBuffer(); SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0); if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); DropField(); return PM3_ETIMEOUT; } @@ -2324,7 +2324,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) { clearCommandBuffer(); SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT, 2, 0, rats, sizeof(rats)); if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index fa5fb266a..7a3875e00 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -1182,7 +1182,7 @@ static void hf15EmlClear(void) { SendCommandNG(CMD_HF_ISO15693_EML_CLEAR, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_HF_ISO15693_EML_CLEAR, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } } diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index be0fe2e62..22cf5eb41 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -264,7 +264,7 @@ static const char *felica_model_name(uint8_t rom_type, uint8_t ic_type) { */ static bool waitCmdFelica(bool iSelect, PacketResponseNG *resp, bool verbose) { if (WaitForResponseTimeout(CMD_ACK, resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return false; } @@ -2068,7 +2068,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) { return PM3_EOPABORTED; } if (timeout > 10) { - PrintAndLogEx(WARNING, "\ntimeout while waiting for reply."); + PrintAndLogEx(WARNING, "\ntimeout while waiting for reply"); DropField(); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 885c27c1d..302f9d9ce 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -922,7 +922,7 @@ static int CmdHFiClassSim(const char *Cmd) { return PM3_EOPABORTED; } if (tries > 20) { - PrintAndLogEx(WARNING, "\ntimeout while waiting for reply."); + PrintAndLogEx(WARNING, "\ntimeout while waiting for reply"); return PM3_ETIMEOUT; } } @@ -973,7 +973,7 @@ static int CmdHFiClassSim(const char *Cmd) { return PM3_EOPABORTED; } if (tries > 20) { - PrintAndLogEx(WARNING, "\ntimeout while waiting for reply."); + PrintAndLogEx(WARNING, "\ntimeout while waiting for reply"); return PM3_ETIMEOUT; } } @@ -1186,7 +1186,7 @@ static int CmdHFiClassELoad(const char *Cmd) { SendCommandNG(CMD_SPIFFS_ELOAD, (uint8_t *)filename, fnlen); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_SPIFFS_ELOAD, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhflto.c b/client/src/cmdhflto.c index 7542114b1..f68dcdd5e 100644 --- a/client/src/cmdhflto.c +++ b/client/src/cmdhflto.c @@ -132,7 +132,7 @@ static int lto_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response, uint16 PacketResponseNG resp; if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { - if (verbose) PrintAndLogEx(WARNING, "timeout while waiting for reply."); + if (verbose) PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index be3eb80ec..0f23b7922 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -4713,7 +4713,7 @@ int CmdHF14AMfELoad(const char *Cmd) { SendCommandNG(CMD_SPIFFS_ELOAD, (uint8_t *)filename, fnlen); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_SPIFFS_ELOAD, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 123760fcd..1b6be4145 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -1446,7 +1446,7 @@ static int CmdHF14aDesChk(const char *Cmd) { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index 37e76a0f7..bb4bd28ce 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -1655,7 +1655,7 @@ static int CmdHFMFPChk(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 9ef064824..40f546741 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -315,7 +315,7 @@ int ul_read_uid(uint8_t *uid) { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } iso14a_card_select_t card; @@ -4231,7 +4231,7 @@ static int CmdHF14AMfUKeyGen(const char *Cmd) { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhfthinfilm.c b/client/src/cmdhfthinfilm.c index 6a477e5f6..4e3bafdb9 100644 --- a/client/src/cmdhfthinfilm.c +++ b/client/src/cmdhfthinfilm.c @@ -126,7 +126,7 @@ int infoThinFilm(bool verbose) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_HF_THINFILM_READ, &resp, 1500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdhftopaz.c b/client/src/cmdhftopaz.c index dba9d65c4..d7205c784 100644 --- a/client/src/cmdhftopaz.c +++ b/client/src/cmdhftopaz.c @@ -54,7 +54,7 @@ static int topaz_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response, uint SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE | ISO14A_NO_RATS, len, 0, cmd, len); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 1500) == false) { - if (verbose) PrintAndLogEx(WARNING, "timeout while waiting for reply."); + if (verbose) PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index 7bf4dd553..a320ca57b 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -456,7 +456,7 @@ int CmdLFCommandRead(const char *Cmd) { getSamples(samples, false); ret = PM3_SUCCESS; } else { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c index daaad2acc..c56a22e8c 100644 --- a/client/src/cmdlfem410x.c +++ b/client/src/cmdlfem410x.c @@ -756,7 +756,7 @@ static int CmdEM410xClone(const char *Cmd) { packet.mode = HITAGS_UID_REQ_FADV; SendCommandNG(CMD_LF_HITAGS_WRITE, (uint8_t *)&packet, sizeof(packet)); if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 4000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } if (resp.status != PM3_SUCCESS) { @@ -814,7 +814,7 @@ static int CmdEM410xClone(const char *Cmd) { SendCommandNG(CMD_LF_HITAGU_WRITE, (uint8_t *)&packet, sizeof(packet)); if (WaitForResponseTimeout(CMD_LF_HITAGU_WRITE, &resp, 4000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -851,7 +851,7 @@ static int CmdEM410xClone(const char *Cmd) { SendCommandNG(CMD_LF_EM410X_CLONE, (uint8_t *)&payload, sizeof(payload)); if (WaitForResponseTimeout(CMD_LF_EM410X_CLONE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } } diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c index 2a1fcf387..ee1cacaa0 100644 --- a/client/src/cmdlfem4x05.c +++ b/client/src/cmdlfem4x05.c @@ -469,7 +469,7 @@ static int em4x05_login_ext(uint32_t pwd) { SendCommandNG(CMD_LF_EM4X_LOGIN, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X_LOGIN, &resp, 10000) == false) { - PrintAndLogEx(WARNING, "(em4x05_login_ext) timeout while waiting for reply."); + PrintAndLogEx(WARNING, "(em4x05_login_ext) timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -496,7 +496,7 @@ int em4x05_read_word_ext(uint8_t addr, uint32_t pwd, bool use_pwd, uint32_t *wor SendCommandNG(CMD_LF_EM4X_READWORD, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X_READWORD, &resp, 10000) == false) { - PrintAndLogEx(WARNING, "(em4x05_read_word_ext) timeout while waiting for reply."); + PrintAndLogEx(WARNING, "(em4x05_read_word_ext) timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1839,7 +1839,7 @@ int CmdEM4x05Brute(const char *Cmd) { SendCommandNG(CMD_LF_EM4X_BF, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X_BF, &resp, 1000) == false) { - PrintAndLogEx(WARNING, "(EM4x05 Bruteforce) timeout while waiting for reply."); + PrintAndLogEx(WARNING, "(EM4x05 Bruteforce) timeout while waiting for reply"); return PM3_ETIMEOUT; } PrintAndLogEx(INFO, "Bruteforce is running on device side, press button to interrupt"); diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c index bda13661f..db0a1ea53 100644 --- a/client/src/cmdlfem4x50.c +++ b/client/src/cmdlfem4x50.c @@ -341,7 +341,7 @@ static int CmdEM4x50Login(const char *Cmd) { PacketResponseNG resp; SendCommandNG(CMD_LF_EM4X50_LOGIN, (uint8_t *)&password, sizeof(password)); if (WaitForResponseTimeout(CMD_LF_EM4X50_LOGIN, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -631,7 +631,7 @@ int em4x50_read(em4x50_data_t *etd, em4x50_word_t *out) { SendCommandNG(CMD_LF_EM4X50_READ, (uint8_t *)&edata, sizeof(edata)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X50_READ, &resp, EM4X50_TIMEOUT_CMD) == false) { - PrintAndLogEx(WARNING, "(em4x50) timeout while waiting for reply."); + PrintAndLogEx(WARNING, "(em4x50) timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -740,7 +740,7 @@ static int CmdEM4x50Info(const char *Cmd) { SendCommandNG(CMD_LF_EM4X50_INFO, (uint8_t *)&etd, sizeof(etd)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X50_INFO, &resp, EM4X50_TIMEOUT_CMD) == false) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -962,7 +962,7 @@ static int CmdEM4x50Write(const char *Cmd) { SendCommandNG(CMD_LF_EM4X50_WRITE, (uint8_t *)&etd, sizeof(etd)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_EM4X50_WRITE, &resp, EM4X50_TIMEOUT_CMD) == false) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1033,7 +1033,7 @@ static int CmdEM4x50WritePwd(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_LF_EM4X50_WRITEPWD, (uint8_t *)&etd, sizeof(etd)); if (WaitForResponseTimeout(CMD_LF_EM4X50_WRITEPWD, &resp, EM4X50_TIMEOUT_CMD) == false) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1117,7 +1117,7 @@ static int CmdEM4x50Wipe(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_LF_EM4X50_WRITE, (uint8_t *)&etd, sizeof(etd)); if (WaitForResponseTimeout(CMD_LF_EM4X50_WRITE, &resp, EM4X50_TIMEOUT_CMD) == false) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1213,7 +1213,7 @@ static int CmdEM4x50Restore(const char *Cmd) { SendCommandNG(CMD_LF_EM4X50_WRITE, (uint8_t *)&etd, sizeof(etd)); if (WaitForResponseTimeout(CMD_LF_EM4X50_WRITE, &resp, EM4X50_TIMEOUT_CMD) == false) { PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdlfem4x70.c b/client/src/cmdlfem4x70.c index bfd7529fe..b1869cbc8 100644 --- a/client/src/cmdlfem4x70.c +++ b/client/src/cmdlfem4x70.c @@ -478,7 +478,7 @@ static int CmdEM4x70Info(const char *Cmd) { int result = get_em4x70_info(&opts, &info); if (result == PM3_ETIMEOUT) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } else if (result == PM3_SUCCESS) { em4x70_print_info_result(&info); } else { @@ -530,7 +530,7 @@ static int CmdEM4x70Write(const char *Cmd) { int result = writeblock_em4x70(&opts, &info); if (result == PM3_ETIMEOUT) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } else if (result == PM3_SUCCESS) { em4x70_print_info_result(&info); } else { @@ -664,7 +664,7 @@ static int CmdEM4x70Unlock(const char *Cmd) { int result = unlock_em4x70(&opts, &info); if (result == PM3_ETIMEOUT) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } else if (result == PM3_SUCCESS) { em4x70_print_info_result(&info); } else { @@ -726,7 +726,7 @@ static int CmdEM4x70Auth(const char *Cmd) { if (PM3_SUCCESS == result) { PrintAndLogEx(INFO, "Tag Auth Response: %02X %02X %02X", data.grn.grn[0], data.grn.grn[1], data.grn.grn[2]); } else if (PM3_ETIMEOUT == result) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } else { PrintAndLogEx(FAILED, "TAG Authentication ( " _RED_("fail") " )"); } @@ -768,7 +768,7 @@ static int CmdEM4x70SetPIN(const char *Cmd) { int result = setpin_em4x70(&opts, &info); if (result == PM3_ETIMEOUT) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } else if (result == PM3_SUCCESS) { em4x70_print_info_result(&info); PrintAndLogEx(INFO, "Writing new PIN ( " _GREEN_("ok") " )"); @@ -812,7 +812,7 @@ static int CmdEM4x70SetKey(const char *Cmd) { int result = setkey_em4x70(&opts); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Writing new key " _RED_("fail")); @@ -857,7 +857,7 @@ static int CmdEM4x70SetKey(const char *Cmd) { result = verify_auth_em4x70(&opts_v); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return result; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Authenticating with new key ( " _RED_("fail") " )"); @@ -1204,7 +1204,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { result = auth_em4x70(&opts_auth, &tag_grn); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return result; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Authenticating with provided values ( " _RED_("fail") " )"); @@ -1248,7 +1248,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { result = writeblock_em4x70(&opt_write_zeros, &tag_info); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(FAILED, "Timeout while waiting for reply."); + PrintAndLogEx(FAILED, "timeout while waiting for reply"); PrintAndLogEx(HINT, "Block %d data may have been overwritten. Manually restart at step %d", block, step); return result; } else if (PM3_SUCCESS != result) { @@ -1273,7 +1273,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { result = brute_em4x70(&opts_brute, &brute); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(FAILED, "Timeout while waiting for reply."); + PrintAndLogEx(FAILED, "timeout while waiting for reply"); PrintAndLogEx(HINT, "Block %d data was overwritten. Manually restart at step %d", block, step); return result; } else if (PM3_SUCCESS != result) { @@ -1312,7 +1312,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { result = writeblock_em4x70(&opt_write_zeros, &tag_info); if (PM3_ETIMEOUT == result) { - PrintAndLogEx(FAILED, "Timeout while waiting for reply."); + PrintAndLogEx(FAILED, "timeout while waiting for reply"); PrintAndLogEx(HINT, "Block %d data (" _GREEN_("%02X%02X") ") may need to be rewritten", block, brute.partial_key[0], brute.partial_key[1]); return result; } else if (PM3_SUCCESS != result) { @@ -1578,7 +1578,7 @@ bool detect_4x70_block(void) { int result = get_em4x70_info(&opts, &info); if (result == PM3_ETIMEOUT) { // consider removing this output? - PrintAndLogEx(WARNING, "Timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); } return result == PM3_SUCCESS; } diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 6b651dccc..a1631c0b7 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -473,7 +473,7 @@ static int CmdHIDClone(const char *Cmd) { SendCommandNG(CMD_LF_HID_CLONE, (uint8_t *)&payload, sizeof(payload)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HID_CLONE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c index 8e49802aa..9ebe97891 100644 --- a/client/src/cmdlfhitag.c +++ b/client/src/cmdlfhitag.c @@ -520,7 +520,7 @@ static int ht2_check_dictionary(uint32_t key_count, uint8_t *keys, uint8_t keyl SendCommandNG(CMD_LF_HITAG_READER, (uint8_t *)&packet, sizeof(packet)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAG_READER, &resp, 4000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); SendCommandNG(CMD_BREAK_LOOP, NULL, 0); return PM3_ETIMEOUT; } @@ -825,7 +825,7 @@ static bool ht2_get_uid(uint32_t *uid) { SendCommandNG(CMD_LF_HITAG_READER, (uint8_t *) &packet, sizeof(packet)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAG_READER, &resp, 1500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return false; } @@ -1052,7 +1052,7 @@ static int CmdLFHitagRd(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(pm3cmd, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); SendCommandNG(CMD_BREAK_LOOP, NULL, 0); return PM3_ETIMEOUT; } @@ -1141,7 +1141,7 @@ static int CmdLFHitag2CheckChallenges(const char *Cmd) { SendCommandNG(CMD_LF_HITAG_READER, (uint8_t *)&packet, sizeof(packet)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAG_READER, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } if (resp.status != PM3_SUCCESS) { @@ -1303,7 +1303,7 @@ static int CmdLFHitagWriter(const char *Cmd) { SendCommandNG(CMD_LF_HITAG2_WRITE, (uint8_t *)&packet, sizeof(packet)); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAG2_WRITE, &resp, 4000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -1526,7 +1526,7 @@ static int CmdLFHitag2Dump(const char *Cmd) { if (attempt == 0) { PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ESOFT; } @@ -1544,7 +1544,7 @@ static int CmdLFHitag2Dump(const char *Cmd) { SendCommandNG(CMD_LF_HITAG_READER, (uint8_t *) &packet, sizeof(packet)); if (WaitForResponseTimeout(CMD_LF_HITAG_READER, &resp, 5000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } if (resp.status != PM3_SUCCESS) { @@ -2254,7 +2254,7 @@ static int CmdLFHitag2Crack2(const char *Cmd) { if (attempt == 0) { PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ESOFT; } diff --git a/client/src/cmdlfhitaghts.c b/client/src/cmdlfhitaghts.c index af4fe9978..536e62bbf 100644 --- a/client/src/cmdlfhitaghts.c +++ b/client/src/cmdlfhitaghts.c @@ -161,7 +161,7 @@ static bool hts_get_uid(uint32_t *uid) { SendCommandNG(CMD_LF_HITAGS_UID, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGS_UID, &resp, 1500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return false; } @@ -420,7 +420,7 @@ static int CmdLFHitagSRead(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGS_READ, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); SendCommandNG(CMD_BREAK_LOOP, NULL, 0); return PM3_ETIMEOUT; } @@ -607,7 +607,7 @@ static int CmdLFHitagSDump(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGS_READ, &resp, 5000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } @@ -709,7 +709,7 @@ static int CmdLFHitagSRestore(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGS_READ, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); free(dump); return PM3_ETIMEOUT; } @@ -760,7 +760,7 @@ static int CmdLFHitagSRestore(const char *Cmd) { SendCommandNG(CMD_LF_HITAGS_WRITE, (uint8_t *)&packet, sizeof(packet)); if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); free(dump); return PM3_ETIMEOUT; } @@ -833,7 +833,7 @@ static int CmdLFHitagSRestore(const char *Cmd) { SendCommandNG(CMD_LF_HITAGS_WRITE, (uint8_t *)&packet, sizeof(packet)); if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 2000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); free(dump); return PM3_ETIMEOUT; } @@ -918,7 +918,7 @@ static int CmdLFHitagSWrite(const char *Cmd) { PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 4000) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdlfhitagu.c b/client/src/cmdlfhitagu.c index 3758415ed..54b318bd7 100644 --- a/client/src/cmdlfhitagu.c +++ b/client/src/cmdlfhitagu.c @@ -176,7 +176,7 @@ static bool htu_get_uid(uint64_t *uid) { SendCommandNG(CMD_LF_HITAGU_UID, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_LF_HITAGU_UID, &resp, 1500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return false; } diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c index aa27fe6d4..13f044320 100644 --- a/client/src/cmdsmartcard.c +++ b/client/src/cmdsmartcard.c @@ -658,7 +658,7 @@ static int CmdSmartUpgrade(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_SMART_UPLOAD, (uint8_t *)&upload, sizeof(upload)); if (!WaitForResponseTimeout(CMD_SMART_UPLOAD, &resp, 2000)) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); free(firmware); return PM3_ETIMEOUT; } @@ -690,7 +690,7 @@ static int CmdSmartUpgrade(const char *Cmd) { free(firmware); SendCommandNG(CMD_SMART_UPGRADE, (uint8_t *)&payload, sizeof(payload)); if (!WaitForResponseTimeout(CMD_SMART_UPGRADE, &resp, 2500)) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; } diff --git a/client/src/cmdtrace.c b/client/src/cmdtrace.c index 2cc28446b..c217f3e80 100644 --- a/client/src/cmdtrace.c +++ b/client/src/cmdtrace.c @@ -1112,7 +1112,7 @@ static int download_trace(void) { // Query for the size of the trace, downloading PM3_CMD_DATA_SIZE PacketResponseNG resp; if (!GetFromDevice(BIG_BUF, gs_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &resp, 4000, true)) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); free(gs_trace); gs_trace = NULL; return PM3_ETIMEOUT; diff --git a/client/src/mifare/desfirecore.c b/client/src/mifare/desfirecore.c index f390c3ca2..83d29ecf7 100644 --- a/client/src/mifare/desfirecore.c +++ b/client/src/mifare/desfirecore.c @@ -3073,7 +3073,7 @@ int DesfireGetCardUID(DesfireContext_t *ctx) { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 2500) == false) { - PrintAndLogEx(WARNING, "timeout while waiting for reply."); + PrintAndLogEx(WARNING, "timeout while waiting for reply"); return PM3_ETIMEOUT; }