From 62697ca46019b8f974ce0422c4460fdf7936e8d7 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 15 Apr 2021 22:41:47 +0200 Subject: [PATCH] text --- client/src/cmdhf14a.c | 2 +- client/src/cmdhfmf.c | 4 ++-- include/mifare.h | 2 +- tools/pm3_amii_bin2eml.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index e382a5714..b729049d9 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -627,7 +627,7 @@ int CmdHF14ASim(const char *Cmd) { arg_int1("t", "type", "<1-10> ", "Simulation type to use"), arg_str0("u", "uid", "", "4, 7 or 10 byte UID"), arg_int0("n", "num", "", "Exit simulation after blocks have been read by reader. 0 = infinite"), - arg_lit0(NULL, "nr", "Performs the 'reader attack', nr/ar attack against a reader"), + arg_lit0("x", NULL, "Performs the 'reader attack', nr/ar attack against a reader"), arg_lit0(NULL, "sk", "Fill simulator keys from found keys"), arg_lit0("v", "verbose", "verbose output"), arg_param_end diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index a6136ff25..f122e58e3 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -3267,7 +3267,7 @@ void readerAttack(sector_t *k_sector, uint8_t k_sectorsCount, nonces_t data, boo static int CmdHF14AMfSim(const char *Cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "hf mf sim", - "Simulate MIFARE card", + "Simulate MIFARE Classic card", "hf mf sim --mini --> MIFARE Mini\n" "hf mf sim --1k --> MIFARE Classic 1k (default)\n" "hf mf sim --1k -u 0a0a0a0a --> MIFARE Classic 1k with 4b UID\n" @@ -3287,7 +3287,7 @@ static int CmdHF14AMfSim(const char *Cmd) { arg_str0(NULL, "sak", "", "Provide explicit SAK (1 bytes, overrides option t)"), arg_int0("n", "num", " ", "Automatically exit simulation after blocks have been read by reader. 0 = infinite"), arg_lit0("i", "interactive", "Console will not be returned until simulation finishes or is aborted"), - arg_lit0(NULL, "crack", "Performs the 'reader attack', nr/ar attack against a reader"), + arg_lit0("x", NULL, "Performs the 'reader attack', nr/ar attack against a reader"), arg_lit0("e", "emukeys", "Fill simulator keys from found keys"), arg_lit0("v", "verbose", "verbose output"), arg_param_end diff --git a/include/mifare.h b/include/mifare.h index d31368102..e38c7eb45 100644 --- a/include/mifare.h +++ b/include/mifare.h @@ -101,7 +101,7 @@ typedef enum { } mifare_des_kdf_algo_t; //----------------------------------------------------------------------------- -// "hf 14a sim x", "hf mf sim x" attacks +// "hf 14a sim -x", "hf mf sim -x" attacks //----------------------------------------------------------------------------- typedef struct { uint32_t cuid; diff --git a/tools/pm3_amii_bin2eml.pl b/tools/pm3_amii_bin2eml.pl index 380d0035b..83e9f195f 100755 --- a/tools/pm3_amii_bin2eml.pl +++ b/tools/pm3_amii_bin2eml.pl @@ -6,7 +6,7 @@ # # -samy kamkar 05/28/2017 # -# hf mf eload u FILENAME_MINUS_EML +# hf mf eload --ul FILENAME_MINUS_EML # hf 14a sim -t 7 -u UID # perl -lne 'chomp; s/\s+(\S+)$//;$f=$1;if($f=~s/-(\S+)//){$g=hex($1);}else{$g=hex($f)}$f=hex($f); for$m($f..$g){print "0x" . substr(unpack("H4",pack("n",$m)),1) ." => \"$_\","}' /tmp/game >> game2