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

fixes: removed bad references.

Browse source 
chg: 'hf mfu restore e' added the special block writes options
This commit is contained in:
iceman1001 2017-07-14 08:47:23 +02:00
commit c5e04ba927
1 changed files with 59 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

78
client/cmdhfmfu.c
View file

@ -1278,7 +1278,8 @@ int usage_hf_mfu_restore(void){
PrintAndLog(" Options :"); PrintAndLog(" Options :");
PrintAndLog(" k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]"); PrintAndLog(" k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
PrintAndLog(" l : (optional) swap entered key's endianness"); PrintAndLog(" l : (optional) swap entered key's endianness");
PrintAndLog(" s : (optional) enable special write -MAGIC TAG ONLY-"); PrintAndLog(" s : (optional) enable special write UID -MAGIC TAG ONLY-");
PrintAndLog(" e : (optional) enable special write version/signature -MAGIC NTAG 21* ONLY-");
PrintAndLog(" f <FN> : filename w/o .bin to restore"); PrintAndLog(" f <FN> : filename w/o .bin to restore");
PrintAndLog(""); PrintAndLog("");
PrintAndLog(" samples:"); PrintAndLog(" samples:");
@ -1721,6 +1722,16 @@ int CmdHF14AMfUDump(const char *Cmd){
return 0; return 0;
} }
static void wait4response(uint8_t b){
UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
uint8_t isOK = resp.arg[0] & 0xff;
if ( !isOK )
PrintAndLog("failed to write block %d", b);
} else {
PrintAndLog("Command execute timeout");
}
}
int CmdHF14AMfURestore(const char *Cmd){ int CmdHF14AMfURestore(const char *Cmd){
char tempStr[50] = {0}; char tempStr[50] = {0};
@ -1728,11 +1739,11 @@ int CmdHF14AMfURestore(const char *Cmd){
uint8_t authkey[16] = {0}; uint8_t authkey[16] = {0};
uint8_t *p_authkey = authkey; uint8_t *p_authkey = authkey;
uint8_t cmdp = 0, keylen = 0; uint8_t cmdp = 0, keylen = 0;
//uint8_t bldata[16] = {0x00};
bool hasKey = false; bool hasKey = false;
bool swapEndian = false; bool swapEndian = false;
bool errors = false; bool errors = false;
bool write_special = false; bool write_special = false;
bool write_extra = false;
size_t filelen = 0; size_t filelen = 0;
FILE *f; FILE *f;
UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}}; UsbCommand c = {CMD_MIFAREU_WRITEBL, {0,0,0}};
@ -1779,6 +1790,11 @@ int CmdHF14AMfURestore(const char *Cmd){
cmdp++; cmdp++;
write_special = true; write_special = true;
break; break;
case 'e':
case 'E':
cmdp++;
write_extra = true;
break;
default: default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true; errors = true;
@ -1831,6 +1847,12 @@ int CmdHF14AMfURestore(const char *Cmd){
p_authkey = SwapEndian64(authkey, keylen, 4); p_authkey = SwapEndian64(authkey, keylen, 4);
} }
// set key - only once
if ( hasKey ){
c.arg[1] = (keylen == 16) ? 1 : 2;
memcpy(c.d.asBytes+4, p_authkey, keylen);
}
for (uint8_t b = 0; b < pages; b++) { for (uint8_t b = 0; b < pages; b++) {
// only magic tags can write to block 0,1,2,3 // only magic tags can write to block 0,1,2,3
@ -1842,27 +1864,44 @@ int CmdHF14AMfURestore(const char *Cmd){
memcpy(c.d.asBytes, mem->data + (b*4), 4); memcpy(c.d.asBytes, mem->data + (b*4), 4);
if ( hasKey ){
c.arg[1] = (keylen == 16) ? 1 : 2;
memcpy(c.d.asBytes+4, p_authkey, keylen);
}
if ( b < 4) if ( b < 4)
printf("data written block %u - %s\n", b, sprint_hex(c.d.asBytes, 8) ); printf("special block written %u - %s\n", b, sprint_hex(c.d.asBytes, 8) );
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
UsbCommand resp; wait4response(b);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
uint8_t isOK = resp.arg[0] & 0xff;
if ( !isOK )
PrintAndLog("failed to write block %d", b);
} else {
PrintAndLog("Command execute timeout");
}
} }
if ( write_special ) { // write version, signature, pack
// write version, signature, pack if ( write_extra ) {
// pack
c.arg[0] = 0xF1;
memcpy(c.d.asBytes, mem->pack, sizeof(mem->pack) );
printf("special block written %x - %s\n", 0xF1, sprint_hex(c.d.asBytes, 8) );
clearCommandBuffer();
SendCommand(&c);
wait4response(0xF1);
// Signature
for (uint8_t s = 0xF2, i=0; s < 0xFA; s++, i += 4){
c.arg[0] = s;
memcpy(c.d.asBytes, mem->signature+i, 4);
printf("special block written %x - %s\n", s, sprint_hex(c.d.asBytes, 8) );
clearCommandBuffer();
SendCommand(&c);
wait4response(s);
}
// Version
for (uint8_t s = 0xFA, i=0; s < 0xFC; s++, i += 4){
c.arg[0] = s;
memcpy(c.d.asBytes, mem->version+i, 4 );
printf("special block written %x - %s\n", s, sprint_hex(c.d.asBytes, 8) );
clearCommandBuffer();
SendCommand(&c);
wait4response(s);
}
} }
ul_switch_off_field(); ul_switch_off_field();
@ -2270,10 +2309,7 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
PrintAndLog(" Ami | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid)); PrintAndLog(" Ami | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
PrintAndLog(" LD | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid)); PrintAndLog(" LD | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
PrintAndLog("------+----------+-----"); PrintAndLog("------+----------+-----");
PrintAndLog(" Vingcard algo");
PrintAndLog("--------------------");
PrintAndLog(" OTP | %08X", ul_ev1_otpgenA(uid));
PrintAndLog(" KeyA | % " PRIx64, classic_keygenA(uid));
return 0; return 0;
} }
//------------------------------------ //------------------------------------