diff --git a/client/cmddata.c b/client/cmddata.c index e8c33c70c..0f99f5e48 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1527,7 +1527,7 @@ int CmdTuneSamples(const char *Cmd) { int timeout = 0; - PrintAndLogEx(INFO, "\nmeasuring antenna characteristics, please wait..."); + PrintAndLogEx(INFO, "\nMeasuring antenna characteristics, please wait..."); UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING, {0, 0, 0}, {{0}}}; clearCommandBuffer(); @@ -1538,7 +1538,7 @@ int CmdTuneSamples(const char *Cmd) { printf("."); fflush(stdout); if (timeout > 7) { - PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting..."); + PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting..."); return 1; } } diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index c03a39ca0..52b2853b0 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -531,7 +531,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}}; SendCommand(&ca); if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { - PrintAndLogEx(ERR, "Proxmark connection timeout."); + PrintAndLogEx(ERR, "Proxmark3 connection timeout."); return 1; } @@ -553,7 +553,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav memcpy(cr.d.asBytes, rats, 2); SendCommand(&cr); if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { - PrintAndLogEx(ERR, "Proxmark connection timeout."); + PrintAndLogEx(ERR, "Proxmark3 connection timeout."); return 1; } @@ -630,7 +630,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) { UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}, {{0}}}; SendCommand(&ca); if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { - PrintAndLogEx(ERR, "Proxmark connection timeout."); + PrintAndLogEx(ERR, "Proxmark3 connection timeout."); return 1; } @@ -652,7 +652,7 @@ static int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) { memcpy(cr.d.asBytes, rats, 2); SendCommand(&cr); if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { - PrintAndLogEx(ERR, "Proxmark connection timeout."); + PrintAndLogEx(ERR, "Proxmark3 connection timeout."); return 1; } diff --git a/client/cmdhffido.c b/client/cmdhffido.c index c2f02ef0e..48a612e7f 100644 --- a/client/cmdhffido.c +++ b/client/cmdhffido.c @@ -781,7 +781,7 @@ static int CmdHFFido2GetAssertion(const char *cmd) { char fname[300] = {0}; CLIParserInit("hf fido assert", - "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file `fido2.json`. File can be placed in proxmark directory or in `proxmark/fido` directory.", + "Execute a FIDO2 Get Assertion command. Needs json file with parameters. Sample file " _YELLOW_("`fido2.json`") ". File can be placed in proxmark directory or in `proxmark/fido` directory.", "Usage:\n\thf fido assert -> execute command default parameters file `fido2.json`\n" "\thf fido assert test.json -l -> execute command with parameters file `text.json` and add to request CredentialId"); diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c index 4696ed4c6..0850e6606 100644 --- a/client/cmdhficlass.c +++ b/client/cmdhficlass.c @@ -1994,7 +1994,7 @@ static int CmdHFiClassCheckKeys(const char *Cmd) { printf("."); fflush(stdout); if (timeout > 120) { - PrintAndLogEx(WARNING, "\nNo response from Proxmark. Aborting..."); + PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting..."); goto out; } } diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index ab5c1d7d3..0e91c784e 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -1137,7 +1137,7 @@ static int CmdHF14AMfNested(const char *Cmd) { int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true); switch (isOK) { case -1 : - PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); + PrintAndLogEx(WARNING, "Error: No response from Proxmark3.\n"); break; case -2 : PrintAndLogEx(WARNING, "Button pressed. Aborted.\n"); @@ -1207,7 +1207,7 @@ static int CmdHF14AMfNested(const char *Cmd) { int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate); switch (isOK) { case -1 : - PrintAndLogEx(WARNING, "error: No response from Proxmark.\n"); + PrintAndLogEx(WARNING, "error: No response from Proxmark3.\n"); break; case -2 : PrintAndLogEx(WARNING, "button pressed. Aborted.\n"); @@ -1497,7 +1497,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) { if (isOK) { switch (isOK) { case 1 : - PrintAndLogEx(WARNING, "Error: No response from Proxmark.\n"); + PrintAndLogEx(WARNING, "Error: No response from Proxmark3.\n"); break; case 2 : PrintAndLogEx(NORMAL, "Button pressed. Aborted.\n"); @@ -2283,7 +2283,7 @@ static int CmdHF14AMfSniff(const char *Cmd) { PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n"); PrintAndLogEx(NORMAL, "Executing mifare sniffing command. \n"); - PrintAndLogEx(NORMAL, "Press the key on the proxmark3 device to abort both proxmark3 and client.\n"); + PrintAndLogEx(NORMAL, "Press the key on the Proxmark3 device to abort both Proxmark3 and client.\n"); PrintAndLogEx(NORMAL, "Press the key on pc keyboard to abort the client.\n"); PrintAndLogEx(NORMAL, "-------------------------------------------------------------------------\n"); diff --git a/client/cmdhw.c b/client/cmdhw.c index d1ba4274e..bd013e706 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -451,9 +451,9 @@ static command_t CommandTable[] = { {"setlfdivisor", CmdSetDivisor, 0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"}, {"setmux", CmdSetMux, 0, " -- Set the ADC mux to a specific value"}, {"tune", CmdTune, 0, "Measure antenna tuning"}, - {"version", CmdVersion, 0, "Show version information about the connected Proxmark"}, - {"status", CmdStatus, 0, "Show runtime status information about the connected Proxmark"}, - {"ping", CmdPing, 0, "Test if the pm3 is responsive"}, + {"version", CmdVersion, 0, "Show version information about the connected Proxmark3"}, + {"status", CmdStatus, 0, "Show runtime status information about the connected Proxmark3"}, + {"ping", CmdPing, 0, "Test if the Proxmark3 is responding"}, {NULL, NULL, 0, NULL} }; diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index b578a42ea..6934e20e3 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -506,7 +506,7 @@ static bool DecodeT5555TraceBlock(void) { // sanity check. Don't use proxmark if it is offline and you didn't specify useGraphbuf static int SanityOfflineCheck(bool useGraphBuffer) { if (!useGraphBuffer && IsOffline()) { - PrintAndLogEx(NORMAL, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead"); + PrintAndLogEx(WARNING, "Your proxmark3 device is offline. Specify [1] to use graphbuffer data instead"); return 0; } return 1; @@ -1866,7 +1866,7 @@ static int CmdT55xxChkPwds(const char *Cmd) { printf("."); fflush(stdout); if (timeout > 180) { - PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting..."); + PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting..."); return 2; } } diff --git a/client/comms.c b/client/comms.c index 09554888d..546594c92 100644 --- a/client/comms.c +++ b/client/comms.c @@ -59,7 +59,7 @@ void SendCommand(UsbCommand *c) { #endif if (offline) { - PrintAndLogEx(NORMAL, "Sending bytes to proxmark failed - offline"); + PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline") ); return; } @@ -209,7 +209,7 @@ bool hookUpPM3() { ret = false; offline = 1; } else { - PrintAndLogEx(SUCCESS, "Proxmark reconnected\n"); + PrintAndLogEx(SUCCESS, "Proxmark3 reconnected\n"); serial_port_name = ; ret = true; offline = 0; @@ -275,7 +275,7 @@ __attribute__((force_align_arg_pointer)) if (txBuffer_pending) { if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) { //counter_to_offline++; - PrintAndLogEx(WARNING, "sending bytes to proxmark failed"); + PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed") ); } txBuffer_pending = false; @@ -305,7 +305,7 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode, PrintAndLogEx(INFO, "Using UART port " _YELLOW_("%s"), portname); sp = uart_open(portname, speed); } else { - PrintAndLogEx(SUCCESS, "Waiting for Proxmark to appear on " _YELLOW_("%s"), portname); + PrintAndLogEx(SUCCESS, "Waiting for Proxmark3 to appear on " _YELLOW_("%s"), portname); fflush(stdout); int openCount = 0; do { @@ -419,7 +419,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand *response, size_t ms_timeo if (msclock() - start_time > 3000 && show_warning) { // 3 seconds elapsed (but this doesn't mean the timeout was exceeded) - PrintAndLogEx(INFO, "Waiting for a response from the proxmark..."); + PrintAndLogEx(INFO, "Waiting for a response from the proxmark3..."); PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button"); show_warning = false; } @@ -529,7 +529,7 @@ bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, UsbCommand *resp if (msclock() - start_time > 3000 && show_warning) { // 3 seconds elapsed (but this doesn't mean the timeout was exceeded) - PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark..."); + PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3..."); PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button"); show_warning = false; } diff --git a/client/flash.c b/client/flash.c index 627404ad9..9bf0c94d8 100644 --- a/client/flash.c +++ b/client/flash.c @@ -280,7 +280,7 @@ static int get_proxmark_state(uint32_t *state) { *state = resp.arg[0]; break; default: - fprintf(stderr, _RED_("Error:") "Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd); + fprintf(stderr, _RED_("Error:") "Couldn't get Proxmark3 state, bad response type: 0x%04" PRIx64 "\n", resp.cmd); return -1; break; } @@ -326,12 +326,12 @@ static int enter_bootloader(char *serial_port_name) { fprintf(stdout, " " _GREEN_("Found") "\n"); return 0; } else { - fprintf(stdout, _RED_("Error:") "Proxmark not found.\n"); + fprintf(stdout, _RED_("Error:") "Proxmark3 not found.\n"); return -1; } } - fprintf(stderr, _RED_("Error:") "Unknown Proxmark mode\n"); + fprintf(stderr, _RED_("Error:") "Unknown Proxmark3 mode\n"); return -1; } diff --git a/client/flasher.c b/client/flasher.c index be74ef8e6..ad17fd080 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -40,8 +40,8 @@ static void usage(char *argv0) { fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n"); fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0); #ifdef __linux__ - fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on ',\n"); - fprintf(stdout, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n"); + fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on ',\n"); + fprintf(stdout, " you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n"); @@ -82,7 +82,7 @@ int main(int argc, char **argv) { char *serial_port_name = argv[1]; if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) { - fprintf(stderr, "Could not find Proxmark on " _RED_("%s") ".\n\n", serial_port_name); + fprintf(stderr, "Could not find Proxmark3 on " _RED_("%s") ".\n\n", serial_port_name); return -1; } else { fprintf(stderr, _GREEN_("Found") "\n"); diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c index 6c7f037b9..22f57a817 100644 --- a/client/hid-flasher/flash.c +++ b/client/hid-flasher/flash.c @@ -281,7 +281,7 @@ static int get_proxmark_state(uint32_t *state) { *state = resp.arg[0]; break; default: - fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd); + fprintf(stderr, "Error: Couldn't get Proxmark3 state, bad response type: 0x%04x\n", resp.cmd); return -1; break; } @@ -319,7 +319,7 @@ static int enter_bootloader(void) { SendCommand(&c); fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n"); } - fprintf(stderr, "Waiting for Proxmark to reappear on USB..."); + fprintf(stderr, "Waiting for Proxmark3 to reappear on USB..."); CloseProxmark(); msleep(1000); @@ -333,7 +333,7 @@ static int enter_bootloader(void) { return 0; } - fprintf(stderr, "Error: Unknown Proxmark mode\n"); + fprintf(stderr, "Error: Unknown Proxmark3 mode\n"); return -1; } diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c index 46a68499c..0cc800826 100644 --- a/client/hid-flasher/flasher.c +++ b/client/hid-flasher/flasher.c @@ -55,7 +55,7 @@ int main(int argc, char **argv) { usb_init(); - fprintf(stderr, "Waiting for Proxmark to appear on USB..."); + fprintf(stderr, "Waiting for Proxmark3 to appear on USB..."); while (!OpenProxmark(1)) { msleep(1000); fprintf(stderr, "."); diff --git a/client/mifare/mifarehost.c b/client/mifare/mifarehost.c index b7842dda0..211eaea02 100644 --- a/client/mifare/mifarehost.c +++ b/client/mifare/mifarehost.c @@ -21,7 +21,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) { // message PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n"); PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average"); - PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client."); + PrintAndLogEx(NORMAL, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client."); PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n"); while (true) { @@ -159,7 +159,7 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, // s70 with 40*2 keys to check, 80*85 = 6800 auth. // takes about 97s, still some margin before abort if (timeout > 180) { - PrintAndLogEx(WARNING, "\nno response from Proxmark. Aborting..."); + PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting..."); return 2; } } @@ -919,7 +919,7 @@ int detect_classic_nackbug(bool verbose) { UsbCommand resp; if (verbose) - PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n"); + PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n"); // for nice animation bool term = !isatty(STDIN_FILENO); diff --git a/client/proxmark3.c b/client/proxmark3.c index 4fd182ce7..267071c21 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -206,7 +206,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) { static void dumpAllHelp(int markdown) { PrintAndLogEx(NORMAL, "\n%sProxmark3 command dump%s\n\n", markdown ? "# " : "", markdown ? "" : "\n======================"); - PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark is actually connected.%s\n", markdown ? " " : ""); + PrintAndLogEx(NORMAL, "Some commands are available only if a Proxmark3 is actually connected.%s\n", markdown ? " " : ""); PrintAndLogEx(NORMAL, "Check column \"offline\" for their availability.\n"); PrintAndLogEx(NORMAL, "\n"); command_t *cmds = getTopLevelCommandTable(); @@ -262,7 +262,7 @@ static void show_help(bool showFullHelp, char *exec_name) { PrintAndLogEx(NORMAL, " %s -m\n", exec_name); PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_H" -f -- flush output everytime\n", exec_name); PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_H" -w -- wait for serial port\n", exec_name); - PrintAndLogEx(NORMAL, "\n how to run proxmark3 client\n"); + PrintAndLogEx(NORMAL, "\n how to run Proxmark3 client\n"); PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_H" -- runs the pm3 client\n", exec_name); PrintAndLogEx(NORMAL, " %s -- runs the pm3 client in OFFLINE mode\n", exec_name); PrintAndLogEx(NORMAL, "\n how to execute different commands from terminal\n");