github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

text

Browse source
This commit is contained in:
iceman1001 2021-04-15 22:41:47 +02:00
commit 62697ca460
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdhf14a.c
View file

@ -627,7 +627,7 @@ int CmdHF14ASim(const char *Cmd) {
arg_int1("t", "type", "<1-10> ", "Simulation type to use"), arg_int1("t", "type", "<1-10> ", "Simulation type to use"),
arg_str0("u", "uid", "<hex>", "4, 7 or 10 byte UID"), arg_str0("u", "uid", "<hex>", "4, 7 or 10 byte UID"),
arg_int0("n", "num", "<dec>", "Exit simulation after <numreads> blocks have been read by reader. 0 = infinite"), arg_int0("n", "num", "<dec>", "Exit simulation after <numreads> 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(NULL, "sk", "Fill simulator keys from found keys"),
arg_lit0("v", "verbose", "verbose output"), arg_lit0("v", "verbose", "verbose output"),
arg_param_end arg_param_end

4
client/src/cmdhfmf.c
View file

@ -3267,7 +3267,7 @@ void readerAttack(sector_t *k_sector, uint8_t k_sectorsCount, nonces_t data, boo
static int CmdHF14AMfSim(const char *Cmd) { static int CmdHF14AMfSim(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "hf mf sim", CLIParserInit(&ctx, "hf mf sim",
"Simulate MIFARE card", "Simulate MIFARE Classic card",
"hf mf sim --mini --> MIFARE Mini\n" "hf mf sim --mini --> MIFARE Mini\n"
"hf mf sim --1k --> MIFARE Classic 1k (default)\n" "hf mf sim --1k --> MIFARE Classic 1k (default)\n"
"hf mf sim --1k -u 0a0a0a0a --> MIFARE Classic 1k with 4b UID\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", "<hex>", "Provide explicit SAK (1 bytes, overrides option t)"), arg_str0(NULL, "sak", "<hex>", "Provide explicit SAK (1 bytes, overrides option t)"),
arg_int0("n", "num", "<dec> ", "Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite"), arg_int0("n", "num", "<dec> ", "Automatically exit simulation after <numreads> 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("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("e", "emukeys", "Fill simulator keys from found keys"),
arg_lit0("v", "verbose", "verbose output"), arg_lit0("v", "verbose", "verbose output"),
arg_param_end arg_param_end

2
include/mifare.h
View file

@ -101,7 +101,7 @@ typedef enum {
} mifare_des_kdf_algo_t; } 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 { typedef struct {
uint32_t cuid; uint32_t cuid;

2
tools/pm3_amii_bin2eml.pl
View file

@ -6,7 +6,7 @@
# #
# -samy kamkar 05/28/2017 # -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 # 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 # 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