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

FIX: finally I took the effort to finish the "hf mf c*" commands on device side...

Browse source
This commit is contained in:
iceman1001 2016-02-15 22:04:24 +01:00
commit 6a18e46fa6
1 changed files with 119 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

196
armsrc/mifarecmd.c
View file

@ -1169,15 +1169,15 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
uint8_t workFlags = arg0; uint8_t workFlags = arg0;
uint8_t blockNo = arg1; uint8_t blockNo = arg1;
Dbprintf("ICE :: CSetBlocks Flags %02x", workFlags);
// variables // variables
bool isOK = false; //assume we will get an error
uint8_t errormsg = 0x00;
uint8_t uid[10] = {0x00}; uint8_t uid[10] = {0x00};
uint8_t data[18] = {0x00}; uint8_t data[18] = {0x00};
uint32_t cuid = 0; uint32_t cuid = 0;
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
if (workFlags & MAGIC_INIT) { if (workFlags & MAGIC_INIT) {
LED_A_ON(); LED_A_ON();
@ -1187,65 +1187,83 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
set_tracing(TRUE); set_tracing(TRUE);
} }
// read UID and return to client //loop doesn't loop just breaks out if error
if (workFlags & MAGIC_UID) { while (true) {
if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) { // read UID and return to client with write
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card"); if (workFlags & MAGIC_UID) {
OnErrorMagic(MAGIC_UID); if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {
} if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
} errormsg = MAGIC_UID;
// break;
}
// wipe tag, fill it with zeros if ( mifare_classic_halt_ex(NULL) ) break;
if (workFlags & MAGIC_WIPE){
ReaderTransmitBitsPar(wupC1,7,0, NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
OnErrorMagic(MAGIC_WIPE);
} }
ReaderTransmit(wipeC, sizeof(wipeC), NULL); // wipe tag, fill it with zeros
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (workFlags & MAGIC_WIPE){
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error"); ReaderTransmitBitsPar(wupC1,7,0, NULL);
OnErrorMagic(MAGIC_WIPE); if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
} if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
} errormsg = MAGIC_WIPE;
break;
}
// write block ReaderTransmit(wipeC, sizeof(wipeC), NULL);
if (workFlags & MAGIC_WUPC) { if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
ReaderTransmitBitsPar(wupC1,7,0, NULL); if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error");
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { errormsg = MAGIC_WIPE;
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error"); break;
OnErrorMagic(MAGIC_WUPC); }
if ( mifare_classic_halt_ex(NULL) ) break;
} }
ReaderTransmit(wupC2, sizeof(wupC2), NULL); // write block
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (workFlags & MAGIC_WUPC) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error"); ReaderTransmitBitsPar(wupC1,7,0, NULL);
OnErrorMagic(MAGIC_WUPC); if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
errormsg = MAGIC_WUPC;
break;
}
ReaderTransmit(wupC2, sizeof(wupC2), NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");
errormsg = MAGIC_WUPC;
break;
}
} }
}
if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) { if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send command error"); if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send command error");
OnErrorMagic(4); errormsg = 4;
} break;
}
memcpy(data, datain, 16); memcpy(data, datain, 16);
AppendCrc14443a(data, 16); AppendCrc14443a(data, 16);
ReaderTransmit(data, sizeof(data), NULL); ReaderTransmit(data, sizeof(data), NULL);
if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) { if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send data error"); if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send data error");
OnErrorMagic(0); errormsg = 0;
} break;
}
if (workFlags & MAGIC_OFF) if (workFlags & MAGIC_OFF)
mifare_classic_halt_ex(NULL); if ( mifare_classic_halt_ex(NULL) ) break;
LED_B_ON(); isOK = true;
// check if uid is cuid? break;
cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
LED_B_OFF(); } // end while
if (isOK )
cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));
else
OnErrorMagic(errormsg);
if (workFlags & MAGIC_OFF) if (workFlags & MAGIC_OFF)
OnSuccessMagic(); OnSuccessMagic();
@ -1255,11 +1273,13 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
uint8_t workFlags = arg0; uint8_t workFlags = arg0;
uint8_t blockNo = arg1; uint8_t blockNo = arg1;
uint8_t errormsg = 0x00;
bool isOK = false; //assume we will get an error
// variables // variables
uint8_t data[MAX_MIFARE_FRAME_SIZE]; uint8_t data[MAX_MIFARE_FRAME_SIZE];
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
@ -1271,41 +1291,51 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
set_tracing(TRUE); set_tracing(TRUE);
} }
if (workFlags & MAGIC_WUPC) { //loop doesn't loop just breaks out if error or done
ReaderTransmitBitsPar(wupC1,7,0, NULL); while (true) {
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if (workFlags & MAGIC_WUPC) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error"); ReaderTransmitBitsPar(wupC1,7,0, NULL);
OnErrorMagic(MAGIC_WUPC); if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");
errormsg = MAGIC_WUPC;
break;
}
ReaderTransmit(wupC2, sizeof(wupC2), NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");
errormsg = MAGIC_WUPC;
break;
}
} }
ReaderTransmit(wupC2, sizeof(wupC2), NULL); // read block
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error"); if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
OnErrorMagic(MAGIC_WUPC); errormsg = 0;
break;
} }
memcpy(data, receivedAnswer, sizeof(data));
// send HALT
if (workFlags & MAGIC_HALT) {
mifare_classic_halt_ex(NULL);
break;
}
isOK = true;
break;
} }
// read block
if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");
OnErrorMagic(0);
}
memcpy(data, receivedAnswer, sizeof(data));
// send HALT
if (workFlags & MAGIC_HALT)
mifare_classic_halt_ex(NULL);
LED_B_ON();
// if MAGIC_DATAIN, the data stays on device side. // if MAGIC_DATAIN, the data stays on device side.
if (workFlags & MAGIC_DATAIN) if (workFlags & MAGIC_DATAIN) {
memcpy(datain, data, sizeof(data)); if (isOK)
else memcpy(datain, data, sizeof(data));
cmd_send(CMD_ACK,1,0,0,data,sizeof(data)); } else {
if (isOK)
LED_B_OFF(); cmd_send(CMD_ACK,1,0,0,data,sizeof(data));
else
OnErrorMagic(errormsg);
}
if (workFlags & MAGIC_OFF) if (workFlags & MAGIC_OFF)
OnSuccessMagic(); OnSuccessMagic();