Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-24 07:34:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

code cleaning (#445)

Browse source
This commit is contained in:
Oleg Moiseenko 2017-10-26 20:09:53 +03:00 committed by pwpiwi
parent 5d7d0c3af9
commit e17660d5f7
3 changed files with 4 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
armsrc/mifarecmd.c
View file

@ -1514,8 +1514,6 @@ void MifareCIdent(){
LED_A_ON(); LED_A_ON();
LED_B_OFF(); LED_B_OFF();
LED_C_OFF(); LED_C_OFF();
// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
// SpinDelay(100);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
clear_trace(); clear_trace();

21
client/cmdhf14a.c
View file

@ -405,26 +405,7 @@ int CmdHF14AReader(const char *Cmd)
// try to see if card responses to "chinese magic backdoor" commands. // try to see if card responses to "chinese magic backdoor" commands.
c.cmd = CMD_MIFARE_CIDENT; mfCIdentify();
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
WaitForResponse(CMD_ACK,&resp);
uint8_t isGeneration = resp.arg[0] & 0xff;
switch( isGeneration ){
case 1: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1a): YES"); break;
case 2: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1b): YES"); break;
default: PrintAndLog("Answers to chinese magic backdoor commands: NO"); break;
}
// disconnect
c.cmd = CMD_READER_ISO_14443a;
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
return select_status; return select_status;
} }

38
client/mifarehost.c
View file

@ -540,35 +540,10 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID) {
return 0; return 0;
} }
int mfCIdentify() int mfCIdentify() {
{ UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};
UsbCommand c;
// UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
// SendCommand(&c);
UsbCommand resp;
// WaitForResponse(CMD_ACK,&resp);
// iso14a_card_select_t card;
// memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
// uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
// if(select_status != 0) {
// uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
// c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
// c.arg[1] = 2;
// c.arg[2] = 0;
// memcpy(c.d.asBytes, rats, 2);
// SendCommand(&c);
// WaitForResponse(CMD_ACK,&resp);
// }
c.cmd = CMD_MIFARE_CIDENT;
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c); SendCommand(&c);
UsbCommand resp;
WaitForResponse(CMD_ACK,&resp); WaitForResponse(CMD_ACK,&resp);
uint8_t isGeneration = resp.arg[0] & 0xff; uint8_t isGeneration = resp.arg[0] & 0xff;
@ -578,13 +553,6 @@ int mfCIdentify()
default: PrintAndLog("No chinese magic backdoor command detected"); break; default: PrintAndLog("No chinese magic backdoor command detected"); break;
} }
// disconnect
// c.cmd = CMD_READER_ISO_14443a;
// c.arg[0] = 0;
// c.arg[1] = 0;
// c.arg[2] = 0;
// SendCommand(&c);
return (int) isGeneration; return (int) isGeneration;
} }