From 6f6a3161a97d66acd0650edbb5c593c118ccf386 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 4 Oct 2021 20:48:55 +0200 Subject: [PATCH] Fix typos, applying Fix-spelling-errors.patch from Kali, thanks Sophie! https://gitlab.com/kalilinux/packages/proxmark3/-/commit/da550dbec709d1a288ef310776a402c8fdd68e2e#6e9d1bb9c071feb1a5ad25ec24296a3f6751f2d1 --- armsrc/hitag2.c | 10 +++++----- client/src/cmdanalyse.c | 6 +++--- client/src/cmdhf14a.c | 6 +++--- client/src/cmdhficlass.c | 4 ++-- client/src/cmdhfmfdes.c | 10 +++++----- client/src/cmdlfhitag.c | 2 +- client/src/cmdlfpcf7931.c | 2 +- client/src/emv/cmdemv.c | 2 +- client/src/mifare/desfirecore.c | 4 ++-- client/src/proxmark3.c | 2 +- doc/commands.json | 10 +++++----- doc/magic_cards_notes.md | 2 +- tools/mfkey/mfkey32.c | 2 +- tools/mfkey/mfkey32v2.c | 2 +- tools/mfkey/mfkey64.c | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c index 9af8f2944..be6d40dd2 100644 --- a/armsrc/hitag2.c +++ b/armsrc/hitag2.c @@ -460,7 +460,7 @@ static bool hitag_plain(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *tx } } if (blocknr > 63) { - DbpString("Read succesful!"); + DbpString("Read successful!"); *txlen = 0; bSuccessful = true; return false; @@ -477,7 +477,7 @@ static bool hitag_plain(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t *tx } break; default: { - Dbprintf("Uknown frame length: %d", rxlen); + Dbprintf("Unknown frame length: %d", rxlen); return false; } break; @@ -578,13 +578,13 @@ static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si memcpy(tag.sectors[blocknr], rx, 4); blocknr++; if (blocknr > 63) { - DbpString("Read succesful!"); + DbpString("Read successful!"); bSuccessful = true; return false; } // TEST - Dbprintf("Succesfully authenticated with logdata:"); + Dbprintf("Successfully authenticated with logdata:"); Dbhexdump(4, logdata_1, false); bSuccessful = true; return false; @@ -601,7 +601,7 @@ static bool hitag1_authenticate(uint8_t *rx, const size_t rxlen, uint8_t *tx, si } break; default: { - Dbprintf("Uknown frame length: %d", rxlen); + Dbprintf("Unknown frame length: %d", rxlen); return false; } break; diff --git a/client/src/cmdanalyse.c b/client/src/cmdanalyse.c index 0c899a78e..2bdeb097d 100644 --- a/client/src/cmdanalyse.c +++ b/client/src/cmdanalyse.c @@ -1127,9 +1127,9 @@ static int CmdAnalyseUnits(const char *Cmd) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "SSP CLK 3.39MHz to US conversions"); - PrintAndLogEx(INFO, " 32 SSP = %u US (expext 9 or 10) " _GREEN_("ok"), SSP_TO_US(32)); - PrintAndLogEx(INFO, " 320 SSP = %u US (expext 94 or 95) " _GREEN_("ok"), SSP_TO_US(320)); - PrintAndLogEx(INFO, "1024 SSP = %u US (expext 302) " _GREEN_("ok"), SSP_TO_US(1024)); + PrintAndLogEx(INFO, " 32 SSP = %u US (expect 9 or 10) " _GREEN_("ok"), SSP_TO_US(32)); + PrintAndLogEx(INFO, " 320 SSP = %u US (expect 94 or 95) " _GREEN_("ok"), SSP_TO_US(320)); + PrintAndLogEx(INFO, "1024 SSP = %u US (expect 302) " _GREEN_("ok"), SSP_TO_US(1024)); PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "ETU to SSP CLK 3.39MHz conversions"); diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 7c06a2487..3d49e63f5 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -2237,8 +2237,8 @@ static int CmdHf14AFindapdu(const char *Cmd) { arg_str0(NULL, "p2", "", "Start value of P2 (1 hex byte)"), arg_u64_0("r", "reset", "", "Minimum secondes before resetting the tag (to prevent timeout issues). Default is 5 minutes"), arg_u64_0("e", "error-limit", "", "Maximum times an status word other than 0x9000 or 0x6D00 is shown. Default is 512."), - arg_strx0("s", "skip-ins", "", "Do not test an instructions (can be specifed multiple times)"), - arg_lit0("l", "with-le", "Serach for APDUs with Le=0 (case 2S) as well"), + arg_strx0("s", "skip-ins", "", "Do not test an instructions (can be specified multiple times)"), + arg_lit0("l", "with-le", "Search for APDUs with Le=0 (case 2S) as well"), arg_lit0("v", "verbose", "Verbose output"), arg_param_end }; @@ -2365,7 +2365,7 @@ retry_ins: DropField(); activate_field = true; t_last_reset = msclock(); - PrintAndLogEx(INFO, "Last reset was %" PRIu64 " seconds ago. Reseting the tag to prevent timeout issues", t_since_last_reset); + PrintAndLogEx(INFO, "Last reset was %" PRIu64 " seconds ago. Resetting the tag to prevent timeout issues", t_since_last_reset); } PrintAndLogEx(INFO, "Status: [ CLA " _GREEN_("%02X") " INS " _GREEN_("%02X") " P1 " _GREEN_("%02X") " P2 " _GREEN_("%02X") " ]", cla, ins, p1, p2); } while (p1 != p1_arg[0] || p2 != p2_arg[0]); diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 415aec9d5..e214e8718 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -303,7 +303,7 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke if (strstr(o->desc, "Keyroll") != NULL) { if (got_kr == false) { - PrintAndLogEx(ERR, "please specifiy KEYROLL key!"); + PrintAndLogEx(ERR, "please specify KEYROLL key!"); free(data); return PM3_EINVARG; } @@ -3882,7 +3882,7 @@ static int CmdHFiClassConfigCard(const char *Cmd) { const iclass_config_card_item_t *item = get_config_card_item(ccidx); if (strstr(item->desc, "Keyroll") != NULL) { if (got_kr == false) { - PrintAndLogEx(ERR, "please specifiy KEYROLL key!"); + PrintAndLogEx(ERR, "please specify KEYROLL key!"); return PM3_EINVARG; } } diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index a039ebfa7..f82fbe449 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2305,9 +2305,9 @@ static int CmdHF14ADesCreateApp(const char *Cmd) { " 2: Free create/delete without master key\n"\ " 0: CreateFile/DeleteFile only with AMK auth\n"\ " 1: CreateFile/DeleteFile always\n"\ - " 3: Configuration changable\n"\ + " 3: Configuration changeable\n"\ " 0: Configuration frozen\n"\ - " 1: Configuration changable if authenticated with AMK (default)\n"\ + " 1: Configuration changeable if authenticated with AMK (default)\n"\ " 4-7: ChangeKey Access Rights\n"\ " 0: Application master key needed (default)\n"\ " 0x1..0xD: Auth with specific key needed to change any key\n"\ @@ -4337,10 +4337,10 @@ static int CmdHF14ADesValueOperations(const char *Cmd) { } if (verbose) - PrintAndLogEx(INFO, "Transaction commited"); + PrintAndLogEx(INFO, "Transaction committed"); } else { if (verbose) - PrintAndLogEx(INFO, "Nothing to clear. Vallue allready in the minimum level."); + PrintAndLogEx(INFO, "Nothing to clear. Value already in the minimum level."); } PrintAndLogEx(SUCCESS, "Value cleared " _GREEN_("successfully")); @@ -4431,7 +4431,7 @@ static int CmdHF14ADesClearRecordFile(const char *Cmd) { } if (verbose) - PrintAndLogEx(INFO, "Transaction commited"); + PrintAndLogEx(INFO, "Transaction committed"); PrintAndLogEx(SUCCESS, "File %02x in the %s cleared " _GREEN_("successfully"), fnum, DesfireWayIDStr(selectway, id)); diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c index d19a3dc57..02d84321a 100644 --- a/client/src/cmdlfhitag.c +++ b/client/src/cmdlfhitag.c @@ -861,7 +861,7 @@ static int CmdLFHitag2Dump(const char *Cmd) { return PM3_EINVARG; } - PrintAndLogEx(WARNING, "to be implememted..."); + PrintAndLogEx(WARNING, "to be implemented..."); /* PrintAndLogEx(SUCCESS, "Dumping tag memory..."); diff --git a/client/src/cmdlfpcf7931.c b/client/src/cmdlfpcf7931.c index be685bb0c..ec3775202 100644 --- a/client/src/cmdlfpcf7931.c +++ b/client/src/cmdlfpcf7931.c @@ -36,7 +36,7 @@ int pcf7931_resetConfig(void) { configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY; configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH; configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION; - PrintAndLogEx(INFO, "Configuration resetted"); + PrintAndLogEx(INFO, "Configuration reset"); PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf pcf7931 config`") " to view current settings"); return PM3_SUCCESS; } diff --git a/client/src/emv/cmdemv.c b/client/src/emv/cmdemv.c index 11111c530..00bc008db 100644 --- a/client/src/emv/cmdemv.c +++ b/client/src/emv/cmdemv.c @@ -528,7 +528,7 @@ static int CmdEMVGenerateChallenge(const char *Cmd) { "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\n" "Needs a EMV applet to be selected and GPO to be executed.", "emv challenge -> get challenge\n" - "emv challenge -k -> get challenge, keep fileld ON\n"); + "emv challenge -k -> get challenge, keep filled ON\n"); void *argtable[] = { arg_param_begin, diff --git a/client/src/mifare/desfirecore.c b/client/src/mifare/desfirecore.c index 21f08dcd2..92edc7883 100644 --- a/client/src/mifare/desfirecore.c +++ b/client/src/mifare/desfirecore.c @@ -269,7 +269,7 @@ const char *DesfireAuthErrorToStr(int error) { case 200: return "Can't select application."; case 201: - return "Authentication retured no error but channel not authenticated."; + return "Authentication returned no error but channel not authenticated."; case 202: return "Can't select application by ISO ID."; case 203: @@ -289,7 +289,7 @@ const char *DesfireAuthErrorToStr(int error) { case 307: return "Crypto decode piccrnd2 error."; case 308: - return "Random numbers dont match. Authentication failed."; + return "Random numbers don't match. Authentication failed."; default: break; } diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c index 93446104a..8cecd9c71 100644 --- a/client/src/proxmark3.c +++ b/client/src/proxmark3.c @@ -627,7 +627,7 @@ static void show_help(bool showFullHelp, char *exec_name) { PrintAndLogEx(NORMAL, "\nExamples:"); PrintAndLogEx(NORMAL, "\n to run Proxmark3 client:\n"); PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_EXAMPLE_H" -- runs the pm3 client", exec_name); - PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_EXAMPLE_H" -f -- flush output everytime", exec_name); + PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_EXAMPLE_H" -f -- flush output every time", exec_name); PrintAndLogEx(NORMAL, " %s "SERIAL_PORT_EXAMPLE_H" -w -- wait for serial port", exec_name); PrintAndLogEx(NORMAL, " %s -- runs the pm3 client in OFFLINE mode", exec_name); PrintAndLogEx(NORMAL, "\n to execute different commands from terminal:\n"); diff --git a/doc/commands.json b/doc/commands.json index d0c84c398..e2bb32e97 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -711,7 +711,7 @@ "description": "executes generate challenge command. it returns 4 or 8-byte random number from card. needs a emv applet to be selected and gpo to be executed.", "notes": [ "emv challenge -> get challenge", - "emv challenge -k -> get challenge, keep fileld on" + "emv challenge -k -> get challenge, keep filled on" ], "offline": false, "options": [ @@ -1052,7 +1052,7 @@ "--p2 start value of p2 (1 hex byte)", "-r, --reset minimum secondes before resetting the tag (to prevent timeout issues). default is 5 minutes", "-e, --error-limit maximum times an status word other than 0x9000 or 0x6d00 is shown. default is 512.", - "-s, --skip-ins do not test an instructions (can be specifed multiple times)", + "-s, --skip-ins do not test an instructions (can be specified multiple times)", "-l, --with-le serach for apdus with le=0 (case 2s) as well", "-v, --verbose verbose output" ], @@ -4153,9 +4153,9 @@ "2: free create/delete without master key", "0: createfile/deletefile only with amk auth", "1: createfile/deletefile always", - "3: configuration changable", + "3: configuration changeable", "0: configuration frozen", - "1: configuration changable if authenticated with amk (default)", + "1: configuration changeable if authenticated with amk (default)", "4-7: changekey access rights", "0: application master key needed (default)", "0x1..0xd: auth with specific key needed to change any key", @@ -10002,4 +10002,4 @@ "extracted_by": "PM3Help2JSON v1.00", "extracted_on": "2021-09-03T21:05:08" } -} \ No newline at end of file +} diff --git a/doc/magic_cards_notes.md b/doc/magic_cards_notes.md index 0fbb3b027..115ec3bb4 100644 --- a/doc/magic_cards_notes.md +++ b/doc/magic_cards_notes.md @@ -509,7 +509,7 @@ Note: It doesn't seem to follow a APDU structure per default, * UID: 4b, 7b and 10b versions * ATQA/SAK: changeable * BCC: -* ATS: changable +* ATS: changeable * Card Type: changeable * Shadow mode: GTU * Backdoor password mode: diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c index d88c3c74d..18f515932 100644 --- a/tools/mfkey/mfkey32.c +++ b/tools/mfkey/mfkey32.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { printf(" {ar_1}: %08x\n", ar1_enc); // Generate lfsr succesors of the tag challenge - printf("\nLFSR succesors of the tag challenge:\n"); + printf("\nLFSR successors of the tag challenge:\n"); uint32_t p64 = prng_successor(nt, 64); printf(" nt': %08x\n", p64); printf(" nt'': %08x\n", prng_successor(p64, 32)); diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c index f5256fb1c..695470255 100644 --- a/tools/mfkey/mfkey32v2.c +++ b/tools/mfkey/mfkey32v2.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { printf(" {ar_1}: %08x\n", ar1_enc); // Generate lfsr succesors of the tag challenge - printf("\nLFSR succesors of the tag challenge:\n"); + printf("\nLFSR successors of the tag challenge:\n"); uint32_t p64 = prng_successor(nt0, 64); uint32_t p64b = prng_successor(nt1, 64); diff --git a/tools/mfkey/mfkey64.c b/tools/mfkey/mfkey64.c index 04126c7cf..9317a6a39 100644 --- a/tools/mfkey/mfkey64.c +++ b/tools/mfkey/mfkey64.c @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) { } // Generate lfsr succesors of the tag challenge - printf("\nLFSR succesors of the tag challenge:\n"); + printf("\nLFSR successors of the tag challenge:\n"); uint32_t p64 = prng_successor(nt, 64); printf(" nt': %08x\n", p64); printf(" nt'': %08x\n", prng_successor(p64, 32));