projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD
[proxmark3-svn]
/
client
/
cmdhfmf.c
diff --git
a/client/cmdhfmf.c
b/client/cmdhfmf.c
index 53e7174312a080038cea00b130d76e6ca5a19e28..0cf5bd7f8bd18e33de63cfa954496580f52254a2 100644
(file)
--- a/
client/cmdhfmf.c
+++ b/
client/cmdhfmf.c
@@
-434,7
+434,7
@@
int CmdHF14AMfRestore(const char *Cmd)
{
\r
uint8_t sectorNo,blockNo;
\r
uint8_t keyType = 0;
\r
{
\r
uint8_t sectorNo,blockNo;
\r
uint8_t keyType = 0;
\r
- uint8_t key[6] = {0xFF};
\r
+ uint8_t key[6] = {0xFF
,0xFF,0xFF,0xFF,0xFF,0xFF
};
\r
uint8_t bldata[16] = {0x00};
\r
uint8_t keyA[40][6];
\r
uint8_t keyB[40][6];
\r
uint8_t bldata[16] = {0x00};
\r
uint8_t keyA[40][6];
\r
uint8_t keyB[40][6];
\r
@@
-781,8
+781,8
@@
int CmdHF14AMfChk(const char *Cmd)
PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
\r
PrintAndLog(" * - all sectors");
\r
PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
\r
PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
\r
PrintAndLog(" * - all sectors");
\r
PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
\r
- PrintAndLog("d - write keys to binary file
\n
");
\r
- PrintAndLog("t - write keys to emulator memory");
\r
+ PrintAndLog("d - write keys to binary file");
\r
+ PrintAndLog("t - write keys to emulator memory
\n
");
\r
PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");
\r
PrintAndLog(" hf mf chk *1 ? t");
\r
PrintAndLog(" hf mf chk *1 ? d");
\r
PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");
\r
PrintAndLog(" hf mf chk *1 ? t");
\r
PrintAndLog(" hf mf chk *1 ? d");
\r
@@
-1023,7
+1023,6
@@
int CmdHF14AMf1kSim(const char *Cmd)
PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
\r
PrintAndLog("");
\r
PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");
\r
PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
\r
PrintAndLog("");
\r
PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");
\r
- PrintAndLog(" : hf mf sim u 0a0a0a0a i x");
\r
return 0;
\r
}
\r
uint8_t pnr = 0;
\r
return 0;
\r
}
\r
uint8_t pnr = 0;
\r
@@
-1500,16
+1499,16
@@
int CmdHF14AMfCSetUID(const char *Cmd)
\r
int CmdHF14AMfCSetBlk(const char *Cmd)
\r
{
\r
\r
int CmdHF14AMfCSetBlk(const char *Cmd)
\r
{
\r
- //uint8_t uid[8] = {0x00};
\r
uint8_t memBlock[16] = {0x00};
\r
uint8_t blockNo = 0;
\r
uint8_t memBlock[16] = {0x00};
\r
uint8_t blockNo = 0;
\r
+ bool wipeCard = FALSE;
\r
int res;
\r
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
int res;
\r
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
- PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)>");
\r
+ PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)>
[w]
");
\r
PrintAndLog("sample: hf mf csetblk 1 01020304050607080910111213141516");
\r
PrintAndLog("sample: hf mf csetblk 1 01020304050607080910111213141516");
\r
- PrintAndLog("Set block data for magic Chinese card (only works with
!!!
)");
\r
- PrintAndLog("If you
want wipe card then add 'w' into command line. \n
");
\r
+ PrintAndLog("Set block data for magic Chinese card (only works with
such cards
)");
\r
+ PrintAndLog("If you
also want wipe the card then add 'w' at the end of the command line
");
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-1520,15
+1519,15
@@
int CmdHF14AMfCSetBlk(const char *Cmd)
return 1;
\r
}
\r
\r
return 1;
\r
}
\r
\r
+ char ctmp = param_getchar(Cmd, 2);
\r
+ wipeCard = (ctmp == 'w' || ctmp == 'W');
\r
PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
\r
\r
PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
\r
\r
- //res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
\r
- res = mfCSetBlock(blockNo, memBlock, NULL, 0, CSETBLOCK_SINGLE_OPER);
\r
+ res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);
\r
if (res) {
\r
if (res) {
\r
- PrintAndLog("Can't write block. error=%d", res);
\r
- return 1;
\r
- }
\r
-
\r
+ PrintAndLog("Can't write block. error=%d", res);
\r
+ return 1;
\r
+ }
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-1541,7
+1540,7
@@
int CmdHF14AMfCLoad(const char *Cmd)
char buf[64] = {0x00};
\r
uint8_t buf8[64] = {0x00};
\r
uint8_t fillFromEmulator = 0;
\r
char buf[64] = {0x00};
\r
uint8_t buf8[64] = {0x00};
\r
uint8_t fillFromEmulator = 0;
\r
- int i, len, blockNum, flags;
\r
+ int i, len, blockNum, flags
=0
;
\r
\r
if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {
\r
PrintAndLog("It loads magic Chinese card from the file `filename.eml`");
\r
\r
if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {
\r
PrintAndLog("It loads magic Chinese card from the file `filename.eml`");
\r
@@
-1639,7
+1638,7
@@
int CmdHF14AMfCGetBlk(const char *Cmd) {
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
PrintAndLog("Usage: hf mf cgetblk <block number>");
\r
PrintAndLog("sample: hf mf cgetblk 1");
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
PrintAndLog("Usage: hf mf cgetblk <block number>");
\r
PrintAndLog("sample: hf mf cgetblk 1");
\r
- PrintAndLog("Get block data from magic Chinese card (only works with
!!!
)\n");
\r
+ PrintAndLog("Get block data from magic Chinese card (only works with
such cards
)\n");
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-1666,7
+1665,7
@@
int CmdHF14AMfCGetSc(const char *Cmd) {
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
PrintAndLog("Usage: hf mf cgetsc <sector number>");
\r
PrintAndLog("sample: hf mf cgetsc 0");
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
\r
PrintAndLog("Usage: hf mf cgetsc <sector number>");
\r
PrintAndLog("sample: hf mf cgetsc 0");
\r
- PrintAndLog("Get sector data from magic Chinese card (only works with
!!!
)\n");
\r
+ PrintAndLog("Get sector data from magic Chinese card (only works with
such cards
)\n");
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
Impressum
,
Datenschutz
projects / proxmark3-svn / blobdiff