github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 22:23:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve 'Magic' Mifare tags detection

Browse source
This commit is contained in:
Fl0-0 2017-07-05 09:59:42 +02:00
commit 0f6838d5a0
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
armsrc/mifarecmd.c
View file

@ -1381,24 +1381,23 @@ void MifareCIdent(){
uint8_t wupC2[] = { 0x43 }; uint8_t wupC2[] = { 0x43 };
// variables // variables
byte_t isOK = 1; byte_t isOK = 0;
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE]; uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]; uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
ReaderTransmitBitsPar(wupC1,7,0, NULL); ReaderTransmitBitsPar(wupC1,7,0, NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) {
isOK = 0; isOK = 1;
}; };
ReaderTransmit(wupC2, sizeof(wupC2), NULL); ReaderTransmit(wupC2, sizeof(wupC2), NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) { if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) {
isOK = 0; isOK = 1;
}; };
if (mifare_classic_halt(NULL, 0)) { // From iceman1001: removed the if, since some magic tags misbehavies and send an answer to it.
isOK = 0; mifare_classic_halt(NULL, 0);
};
cmd_send(CMD_ACK,isOK,0,0,0,0); cmd_send(CMD_ACK,isOK,0,0,0,0);
} }