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

chg: code cleaning.

Browse source
This commit is contained in:
iceman1001 2017-12-21 12:42:32 +01:00
commit 3634327bef
3 changed files with 31 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

39
armsrc/iclass.c
View file

@ -1818,19 +1818,15 @@ void ReaderIClass(uint8_t arg0) {
int read_status= 0; int read_status= 0;
uint8_t result_status = 0; uint8_t result_status = 0;
// flag to read until one tag is found successfully
bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;
// flag to only try 5 times to find one tag then return
bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;
// if neither abort_after_read nor try_once then continue reading until button pressed. bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE; // flag to read until one tag is found successfully
bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY; // flag to only try 5 times to find one tag then return
bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY; // flag to try credit key
uint8_t flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF; // test flags for what blocks to be sure to read
bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;
// test flags for what blocks to be sure to read
uint8_t flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF;
//uint8_t flagReadCC = arg0 & FLAG_ICLASS_READER_CC; //uint8_t flagReadCC = arg0 & FLAG_ICLASS_READER_CC;
uint8_t flagReadAA = arg0 & FLAG_ICLASS_READER_AA; uint8_t flagReadAA = arg0 & FLAG_ICLASS_READER_AIA;
setupIclassReader(); setupIclassReader();
@ -1859,7 +1855,7 @@ void ReaderIClass(uint8_t arg0) {
//Read block 1, config //Read block 1, config
if (flagReadConfig) { if (flagReadConfig) {
if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 10)) { if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 5)) {
result_status |= FLAG_ICLASS_READER_CONF; result_status |= FLAG_ICLASS_READER_CONF;
memcpy(card_data+8, resp, 8); memcpy(card_data+8, resp, 8);
} else { } else {
@ -1867,10 +1863,10 @@ void ReaderIClass(uint8_t arg0) {
} }
} }
//Read block 5, AA //Read block 5, AIA
if (flagReadAA) { if (flagReadAA) {
if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) { if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 5)) {
result_status |= FLAG_ICLASS_READER_AA; result_status |= FLAG_ICLASS_READER_AIA;
memcpy(card_data+(8*5), resp, 8); memcpy(card_data+(8*5), resp, 8);
} else { } else {
if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block"); if (MF_DBGLEVEL > 1) DbpString("Failed to dump AA block");
@ -1880,8 +1876,9 @@ void ReaderIClass(uint8_t arg0) {
// 0 : CSN // 0 : CSN
// 1 : Configuration // 1 : Configuration
// 2 : e-purse // 2 : e-purse
// (3,4 write-only, kc and kd) // 3 : kd / debit / aa2 (write-only)
// 5 Application issuer area // 4 : kc / credit / aa1 (write-only)
// 5 : AIA, Application issuer area
// //
//Then we can 'ship' back the 6 * 8 bytes of data, //Then we can 'ship' back the 6 * 8 bytes of data,
// with 0xFF:s in block 3 and 4. // with 0xFF:s in block 3 and 4.
@ -1891,7 +1888,7 @@ void ReaderIClass(uint8_t arg0) {
// only useful if looping in arm (not try_once && not abort_after_read) // only useful if looping in arm (not try_once && not abort_after_read)
if (memcmp(last_csn, card_data, 8) != 0) { if (memcmp(last_csn, card_data, 8) != 0) {
// If caller requires that we get Conf, CC, AA, continue until we got it // If caller requires that we get Conf, CC, AA, continue until we got it
if ( (result_status ^ FLAG_ICLASS_READER_CSN ^ FLAG_ICLASS_READER_CONF ^ FLAG_ICLASS_READER_CC ^ FLAG_ICLASS_READER_AA) == 0) { if ( (result_status ^ FLAG_ICLASS_READER_CSN ^ FLAG_ICLASS_READER_CONF ^ FLAG_ICLASS_READER_CC ^ FLAG_ICLASS_READER_AIA) == 0) {
cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) ); cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data) );
if (abort_after_read) { if (abort_after_read) {
LED_B_OFF(); LED_B_OFF();
@ -1962,7 +1959,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
read[2] = crc >> 8; read[2] = crc >> 8;
read[3] = crc & 0xff; read[3] = crc & 0xff;
if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) { if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
DbpString("Dump config (block 1) failed"); DbpString("Dump config (block 1) failed");
continue; continue;
} }
@ -1990,7 +1987,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
read[2] = crc >> 8; read[2] = crc >> 8;
read[3] = crc & 0xff; read[3] = crc & 0xff;
if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) { if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 5)) {
Dbprintf(" %02x: %02x %02x %02x %02x %02x %02x %02x %02x", Dbprintf(" %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
block, resp[0], resp[1], resp[2], block, resp[0], resp[1], resp[2],
resp[3], resp[4], resp[5], resp[3], resp[4], resp[5],
@ -2169,7 +2166,7 @@ bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
readcmd[3] = crc & 0xff; readcmd[3] = crc & 0xff;
uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0}; uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
bool isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, 10, 10); bool isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, 10, 5);
memcpy(readdata, resp, sizeof(resp)); memcpy(readdata, resp, sizeof(resp));
return isOK; return isOK;
} }
@ -2227,7 +2224,7 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
write[15] = crc & 0xff; write[15] = crc & 0xff;
uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0}; uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
bool isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10); bool isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
if (isOK) { //if reader responded correctly if (isOK) { //if reader responded correctly
//if response is not equal to write values //if response is not equal to write values
@ -2235,7 +2232,7 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
//if not programming key areas (note key blocks don't get programmed with actual key data it is xor data) //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
if (blockNo != 3 && blockNo != 4) { if (blockNo != 3 && blockNo != 4) {
isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10); isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 5);
} }
} }
} }

24
client/cmdhficlass.c
View file

@ -468,7 +468,7 @@ int CmdHFiClassSim(const char *Cmd) {
int HFiClassReader(const char *Cmd, bool loop, bool verbose) { int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
bool tagFound = false; bool tagFound = false;
UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AA}}; UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AIA}};
// loop in client not device - else on windows have a communication error // loop in client not device - else on windows have a communication error
c.arg[0] |= FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY; c.arg[0] |= FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY;
UsbCommand resp; UsbCommand resp;
@ -497,18 +497,10 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
if( readStatus & FLAG_ICLASS_READER_CONF) { if( readStatus & FLAG_ICLASS_READER_CONF) {
printIclassDumpInfo(data); printIclassDumpInfo(data);
} }
if (readStatus & FLAG_ICLASS_READER_AA) { if (readStatus & FLAG_ICLASS_READER_AIA) {
bool legacy = true; bool legacy = ( memcmp( (uint8_t *)(data + 8*5), "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0 );
PrintAndLog(" AppIA: %s", sprint_hex(data+8*5,8)); PrintAndLog(" App IA: %s", sprint_hex(data+8*5, 8));
PrintAndLog(" : Possible iClass %s", (legacy) ? "(legacy tag)" : "(NOT legacy tag)");
//if ( memcmp(data+8*5, '\xff\xff\xff\xff\xff\xff\xff\xff',8) != 0 )
// legacy = false;
for (int i = 0; i<8; i++) {
if (data[8*5+i] != 0xFF) {
legacy = false;
}
}
PrintAndLog(" : Possible iClass %s",(legacy) ? "(legacy tag)" : "(NOT legacy tag)");
} }
if (tagFound && !loop) return 1; if (tagFound && !loop) return 1;
@ -792,7 +784,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
// } // }
if (isOK <= 1){ if (isOK <= 1){
PrintAndLog("Failed to obtain CC! Aborting..."); PrintAndLog("(%d) Failed to obtain CC! Aborting...", isOK);
return false; return false;
} }
return true; return true;
@ -1329,8 +1321,8 @@ int CmdHFiClassCloneTag(const char *Cmd) {
} }
static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) { static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
uint8_t MAC[4]={0x00,0x00,0x00,0x00}; uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
// block 0,1 should always be able to read, and block 5 on some cards. // block 0,1 should always be able to read, and block 5 on some cards.
if (auth || blockno >= 2) { if (auth || blockno >= 2) {

10
include/usb_cmd.h
View file

@ -259,11 +259,11 @@ typedef struct{
//#define FLAG_RANDOM_NONCE 0x40 //#define FLAG_RANDOM_NONCE 0x40
//Iclass reader flags //Iclass reader flags
#define FLAG_ICLASS_READER_ONLY_ONCE 0x01 #define FLAG_ICLASS_READER_ONLY_ONCE 0x01
#define FLAG_ICLASS_READER_CC 0x02 #define FLAG_ICLASS_READER_CC 0x02
#define FLAG_ICLASS_READER_CSN 0x04 #define FLAG_ICLASS_READER_CSN 0x04
#define FLAG_ICLASS_READER_CONF 0x08 #define FLAG_ICLASS_READER_CONF 0x08
#define FLAG_ICLASS_READER_AA 0x10 #define FLAG_ICLASS_READER_AIA 0x10
#define FLAG_ICLASS_READER_ONE_TRY 0x20 #define FLAG_ICLASS_READER_ONE_TRY 0x20
#define FLAG_ICLASS_READER_CEDITKEY 0x40 #define FLAG_ICLASS_READER_CEDITKEY 0x40