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

Merge pull request #202 from marshmellow42/master

Browse source 
add hitag2 uid read and fixes for iclass write
This commit is contained in:
Iceman 2016-12-19 16:09:58 +01:00 • committed by GitHub
commit 910ad5470d
8 changed files with 186 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -5,6 +5,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
## [unreleased][unreleased] ## [unreleased][unreleased]
### Added ### Added
- Added hitag2 read UID only and added that to lf search (marshmellow)
- Added lf pyramid commands (iceman) - Added lf pyramid commands (iceman)
- Added lf presco commands - some bits not fully understood... (iceman) - Added lf presco commands - some bits not fully understood... (iceman)
- Added experimental HitagS support (Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg) - Added experimental HitagS support (Oguzhan Cicek, Hendrik Schwartke, Ralf Spenneberg)
@ -34,9 +35,10 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added 'hf snoop'. This command take digitalized signal from FPGA and put in BigBuffer. (pwpiwi + enio) - Added 'hf snoop'. This command take digitalized signal from FPGA and put in BigBuffer. (pwpiwi + enio)
- Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi) - Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi)
- Added option c to 'hf list' (mark CRC bytes) (piwi) - Added option c to 'hf list' (mark CRC bytes) (piwi)
- Added option `l` or `h` to `hw tune` to save time and unnecessary fpga writes if you are only interested in lf or hf.
### Changed ### Changed
- Fixed bug in lf sim and continuous demods not turning off antenna when finished
- Fixed bug(s) in hf iclass write
- Fixed bug in lf biphase sim - `lf simask b` (and any tagtype that relies on it - gproxii...) (marshmellow) - Fixed bug in lf biphase sim - `lf simask b` (and any tagtype that relies on it - gproxii...) (marshmellow)
- Fixed bug in lf viking clone/sim (iceman) - Fixed bug in lf viking clone/sim (iceman)
- Fixed broken `data askedgedetect` (marshmellow) - Fixed broken `data askedgedetect` (marshmellow)

98
armsrc/hitag2.c
View file

@ -697,6 +697,42 @@ static bool hitag2_test_auth_attempts(byte_t* rx, const size_t rxlen, byte_t* tx
return true; return true;
} }
static bool hitag2_read_uid(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
// Reset the transmission frame length
*txlen = 0;
// Try to find out which command was send by selecting on length (in bits)
switch (rxlen) {
// No answer, try to resurrect
case 0: {
// Just starting or if there is no answer
*txlen = 5;
memcpy(tx,"\xc0",nbytes(*txlen));
} break;
// Received UID
case 32: {
// Check if we received answer tag (at)
if (bAuthenticating) {
bAuthenticating = false;
} else {
// Store the received block
memcpy(tag.sectors[blocknr],rx,4);
blocknr++;
}
if (blocknr > 0) {
//DbpString("Read successful!");
bSuccessful = true;
return false;
}
} break;
// Unexpected response
default: {
Dbprintf("Uknown frame length: %d",rxlen);
return false;
} break;
}
return true;
}
void SnoopHitag(uint32_t type) { void SnoopHitag(uint32_t type) {
int frame_count; int frame_count;
@ -1123,19 +1159,18 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
set_tracing(TRUE); set_tracing(TRUE);
clear_trace(); clear_trace();
DbpString("Starting Hitag reader family"); //DbpString("Starting Hitag reader family");
// Check configuration // Check configuration
switch(htf) { switch(htf) {
case RHT2F_PASSWORD: { case RHT2F_PASSWORD: {
Dbprintf("List identifier in password mode"); Dbprintf("List identifier in password mode");
memcpy(password,htd->pwd.password,4); memcpy(password,htd->pwd.password,4);
blocknr = 0; blocknr = 0;
bQuitTraceFull = false; bQuitTraceFull = false;
bQuiet = false; bQuiet = false;
bPwd = false; bPwd = false;
} break; } break;
case RHT2F_AUTHENTICATE: { case RHT2F_AUTHENTICATE: {
DbpString("Authenticating using nr,ar pair:"); DbpString("Authenticating using nr,ar pair:");
memcpy(NrAr,htd->auth.NrAr,8); memcpy(NrAr,htd->auth.NrAr,8);
@ -1145,7 +1180,6 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
bAuthenticating = false; bAuthenticating = false;
bQuitTraceFull = true; bQuitTraceFull = true;
} break; } break;
case RHT2F_CRYPTO: { case RHT2F_CRYPTO: {
DbpString("Authenticating using key:"); DbpString("Authenticating using key:");
memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code. memcpy(key,htd->crypto.key,6); //HACK; 4 or 6?? I read both in the code.
@ -1156,7 +1190,6 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
bAuthenticating = false; bAuthenticating = false;
bQuitTraceFull = true; bQuitTraceFull = true;
} break; } break;
case RHT2F_TEST_AUTH_ATTEMPTS: { case RHT2F_TEST_AUTH_ATTEMPTS: {
Dbprintf("Testing %d authentication attempts",(auth_table_len/8)); Dbprintf("Testing %d authentication attempts",(auth_table_len/8));
auth_table_pos = 0; auth_table_pos = 0;
@ -1165,7 +1198,13 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
bQuiet = false; bQuiet = false;
bCrypto = false; bCrypto = false;
} break; } break;
case RHT2F_UID_ONLY: {
blocknr = 0;
bQuiet = false;
bCrypto = false;
bAuthenticating = false;
bQuitTraceFull = true;
} break;
default: { default: {
Dbprintf("Error, unknown function: %d",htf); Dbprintf("Error, unknown function: %d",htf);
return; return;
@ -1222,22 +1261,22 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
// hitagS settings // hitagS settings
reset_sof = 1; reset_sof = 1;
t_wait = 200; t_wait = 200;
DbpString("Configured for hitagS reader"); //DbpString("Configured for hitagS reader");
} else if (htf < 20) { } else if (htf < 20) {
// hitag1 settings // hitag1 settings
reset_sof = 1; reset_sof = 1;
t_wait = 200; t_wait = 200;
DbpString("Configured for hitag1 reader"); //DbpString("Configured for hitag1 reader");
} else if (htf < 30) { } else if (htf < 30) {
// hitag2 settings // hitag2 settings
reset_sof = 4; reset_sof = 4;
t_wait = HITAG_T_WAIT_2; t_wait = HITAG_T_WAIT_2;
DbpString("Configured for hitag2 reader"); //DbpString("Configured for hitag2 reader");
} else { } else {
Dbprintf("Error, unknown hitag reader type: %d",htf); Dbprintf("Error, unknown hitag reader type: %d",htf);
return; return;
} }
uint8_t attempt_count=0;
while(!bStop && !BUTTON_PRESS()) { while(!bStop && !BUTTON_PRESS()) {
// Watchdog hit // Watchdog hit
WDT_HIT(); WDT_HIT();
@ -1272,6 +1311,11 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
case RHT2F_TEST_AUTH_ATTEMPTS: { case RHT2F_TEST_AUTH_ATTEMPTS: {
bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen); bStop = !hitag2_test_auth_attempts(rx,rxlen,tx,&txlen);
} break; } break;
case RHT2F_UID_ONLY: {
bStop = !hitag2_read_uid(rx, rxlen, tx, &txlen);
attempt_count++; //attempt 3 times to get uid then quit
if (!bStop && attempt_count == 3) bStop = true;
} break;
default: { default: {
Dbprintf("Error, unknown function: %d",htf); Dbprintf("Error, unknown function: %d",htf);
return; return;
@ -1288,6 +1332,8 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
// we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'. // we need to wait (T_Wait2 + half_tag_period) when the last was a 'one'.
// All timer values are in terms of T0 units // All timer values are in terms of T0 units
while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit))); while(AT91C_BASE_TC0->TC_CV < T0*(t_wait+(HITAG_T_TAG_HALF_PERIOD*lastbit)));
//Dbprintf("DEBUG: Sending reader frame");
// Transmit the reader frame // Transmit the reader frame
hitag_reader_send_frame(tx,txlen); hitag_reader_send_frame(tx,txlen);
@ -1317,7 +1363,9 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
bSkip = true; bSkip = true;
tag_sof = reset_sof; tag_sof = reset_sof;
response = 0; response = 0;
//Dbprintf("DEBUG: Waiting to receive frame");
uint32_t errorCount = 0;
// Receive frame, watch for at most T0*EOF periods // Receive frame, watch for at most T0*EOF periods
while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) { while (AT91C_BASE_TC1->TC_CV < T0*HITAG_T_WAIT_MAX) {
// Check if falling edge in tag modulation is detected // Check if falling edge in tag modulation is detected
@ -1333,19 +1381,29 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
// Capture tag frame (manchester decoding using only falling edges) // Capture tag frame (manchester decoding using only falling edges)
if(ra >= HITAG_T_EOF) { if(ra >= HITAG_T_EOF) {
if (rxlen != 0) { if (rxlen != 0) {
//DbpString("wierd1?"); //Dbprintf("DEBUG: Wierd1");
} }
// Capture the T0 periods that have passed since last communication or field drop (reset) // Capture the T0 periods that have passed since last communication or field drop (reset)
// We always recieve a 'one' first, which has the falling edge after a half period |-_| // We always recieve a 'one' first, which has the falling edge after a half period |-_|
response = ra-HITAG_T_TAG_HALF_PERIOD; response = ra-HITAG_T_TAG_HALF_PERIOD;
} else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) { } else if(ra >= HITAG_T_TAG_CAPTURE_FOUR_HALF) {
// Manchester coding example |-_|_-|-_| (101) // Manchester coding example |-_|_-|-_| (101)
//need to test to verify we don't exceed memory...
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
// break;
//}
rx[rxlen / 8] |= 0 << (7-(rxlen%8)); rx[rxlen / 8] |= 0 << (7-(rxlen%8));
rxlen++; rxlen++;
rx[rxlen / 8] |= 1 << (7-(rxlen%8)); rx[rxlen / 8] |= 1 << (7-(rxlen%8));
rxlen++; rxlen++;
} else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) { } else if(ra >= HITAG_T_TAG_CAPTURE_THREE_HALF) {
// Manchester coding example |_-|...|_-|-_| (0...01) // Manchester coding example |_-|...|_-|-_| (0...01)
//need to test to verify we don't exceed memory...
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
// break;
//}
rx[rxlen / 8] |= 0 << (7-(rxlen%8)); rx[rxlen / 8] |= 0 << (7-(rxlen%8));
rxlen++; rxlen++;
// We have to skip this half period at start and add the 'one' the second time // We have to skip this half period at start and add the 'one' the second time
@ -1357,6 +1415,11 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
bSkip = !bSkip; bSkip = !bSkip;
} else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) { } else if(ra >= HITAG_T_TAG_CAPTURE_TWO_HALF) {
// Manchester coding example |_-|_-| (00) or |-_|-_| (11) // Manchester coding example |_-|_-| (00) or |-_|-_| (11)
//need to test to verify we don't exceed memory...
//if ( ((rxlen+2) / 8) > HITAG_FRAME_LEN) {
// break;
//}
if (tag_sof) { if (tag_sof) {
// Ignore bits that are transmitted during SOF // Ignore bits that are transmitted during SOF
tag_sof--; tag_sof--;
@ -1366,22 +1429,27 @@ void ReaderHitag(hitag_function htf, hitag_data* htd) {
rxlen++; rxlen++;
} }
} else { } else {
//Dbprintf("DEBUG: Wierd2");
errorCount++;
// Ignore wierd value, is to small to mean anything // Ignore wierd value, is to small to mean anything
} }
} }
//if we saw over 100 wierd values break it probably isn't hitag...
if (errorCount >100) break;
// We can break this loop if we received the last bit from a frame // We can break this loop if we received the last bit from a frame
if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) { if (AT91C_BASE_TC1->TC_CV > T0*HITAG_T_EOF) {
if (rxlen>0) break; if (rxlen>0) break;
} }
} }
} }
//Dbprintf("DEBUG: Done waiting for frame");
LED_B_OFF(); LED_B_OFF();
LED_D_OFF(); LED_D_OFF();
AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
Dbprintf("frame received: %d",frame_count); //Dbprintf("frame received: %d",frame_count);
DbpString("All done"); //DbpString("All done");
cmd_send(CMD_ACK,bSuccessful,0,0,(byte_t*)tag.sectors,48); cmd_send(CMD_ACK,bSuccessful,0,0,(byte_t*)tag.sectors,48);
} }

28
armsrc/iclass.c
View file

@ -1473,7 +1473,7 @@ void CodeIClassCommand(const uint8_t * cmd, int len)
for(j = 0; j < 4; j++) { for(j = 0; j < 4; j++) {
for(k = 0; k < 4; k++) { for(k = 0; k < 4; k++) {
if(k == (b & 3)) { if(k == (b & 3)) {
ToSend[++ToSendMax] = 0x0f; ToSend[++ToSendMax] = 0xf0;
} }
else { else {
ToSend[++ToSendMax] = 0x00; ToSend[++ToSendMax] = 0x00;
@ -1580,8 +1580,8 @@ void setupIclassReader()
{ {
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
// Reset trace buffer // Reset trace buffer
set_tracing(TRUE); set_tracing(TRUE);
clear_trace(); clear_trace();
// Setup SSC // Setup SSC
FpgaSetupSsc(); FpgaSetupSsc();
@ -1671,7 +1671,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key)
return read_status; return read_status;
} }
uint8_t handshakeIclassTag(uint8_t *card_data){ uint8_t handshakeIclassTag(uint8_t *card_data) {
return handshakeIclassTag_ext(card_data, false); return handshakeIclassTag_ext(card_data, false);
} }
@ -1983,18 +1983,26 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
} }
bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) { bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
//uint8_t readblockdata[10]; //uint8_t readblockdata[10];
//write[1] = blockNo; //write[1] = blockNo;
memcpy(write+2, data, 12); // data + mac memcpy(write+2, data, 12); // data + mac
char *wrCmd = (char *)(write+1);
uint16_t wrCrc = iclass_crc16(wrCmd, 13);
write[14] = wrCrc >> 8;
write[15] = wrCrc & 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; bool isOK = false;
isOK = sendCmdGetResponseWithRetries(write,sizeof(write),resp,sizeof(resp),10); isOK = sendCmdGetResponseWithRetries(write,sizeof(write),resp,sizeof(resp),10);
if (isOK) { if (isOK) { //if reader responded correctly
//Dbprintf("WriteResp: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",resp[0],resp[1],resp[2],resp[3],resp[4],resp[5],resp[6],resp[7],resp[8],resp[9]); //Dbprintf("WriteResp: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",resp[0],resp[1],resp[2],resp[3],resp[4],resp[5],resp[6],resp[7],resp[8],resp[9]);
if (memcmp(write+2,resp,8)) { if (memcmp(write+2,resp,8)) { //if response is not equal to write values
//error try again if (blockNo != 3 && blockNo != 4) { //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
isOK = sendCmdGetResponseWithRetries(write,sizeof(write),resp,sizeof(resp),10); //error try again
isOK = sendCmdGetResponseWithRetries(write,sizeof(write),resp,sizeof(resp),10);
}
} }
} }
return isOK; return isOK;

18
armsrc/lfops.c
View file

@ -403,6 +403,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
//wait until SSC_CLK goes HIGH //wait until SSC_CLK goes HIGH
while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) { while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
if(BUTTON_PRESS() || (usb_poll_validate_length() )) { if(BUTTON_PRESS() || (usb_poll_validate_length() )) {
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
return; return;
} }
@ -420,8 +421,9 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
LED_D_OFF(); LED_D_OFF();
//wait until SSC_CLK goes LOW //wait until SSC_CLK goes LOW
while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) { while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
if(BUTTON_PRESS()) { if(BUTTON_PRESS() || (usb_poll_validate_length() )) {
DbpString("Stopped"); DbpString("Stopped");
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
return; return;
} }
WDT_HIT(); WDT_HIT();
@ -436,6 +438,7 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol)
SpinDelayUs(gap); SpinDelayUs(gap);
} }
} }
} }
} }
@ -840,13 +843,15 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high = hi; *high = hi;
*low = lo; *low = lo;
return; break;
} }
// reset // reset
} }
hi2 = hi = lo = idx = 0; hi2 = hi = lo = idx = 0;
WDT_HIT(); WDT_HIT();
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -931,12 +936,13 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
} }
if (findone){ if (findone){
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
return; break;
} }
// reset // reset
idx = 0; idx = 0;
WDT_HIT(); WDT_HIT();
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -991,13 +997,14 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high=lo>>32; *high=lo>>32;
*low=lo & 0xFFFFFFFF; *low=lo & 0xFFFFFFFF;
return; break;
} }
} }
WDT_HIT(); WDT_HIT();
hi = lo = size = idx = 0; hi = lo = size = idx = 0;
clk = invert = errCnt = 0; clk = invert = errCnt = 0;
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -1056,7 +1063,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
//LED_A_OFF(); //LED_A_OFF();
*high=code; *high=code;
*low=code2; *low=code2;
return; break;
} }
code=code2=0; code=code2=0;
version=facilitycode=0; version=facilitycode=0;
@ -1065,6 +1072,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
WDT_HIT(); WDT_HIT();
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }

29
client/cmdhficlass.c
View file

@ -777,10 +777,10 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
if (have_debit_key) memcpy(tag_data+(3*8),div_key,8); if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8); if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
// print the dump // print the dump
printf("CSN |00| %02X %02X %02X %02X %02X %02X %02X %02X |\n",tag_data[0],tag_data[1],tag_data[2] printf("------+--+-------------------------+\n");
,tag_data[3],tag_data[4],tag_data[5],tag_data[6],tag_data[7]); printf("CSN |00| %s|\n",sprint_hex(tag_data, 8));
printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8); printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
if (filename[0] == 0){ if (filename[0] == 0){
snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x", snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
tag_data[0],tag_data[1],tag_data[2],tag_data[3], tag_data[0],tag_data[1],tag_data[2],tag_data[3],
@ -1255,7 +1255,6 @@ int CmdHFiClass_loclass(const char *Cmd) {
} }
void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) { void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
uint8_t blockdata[8];
uint8_t mem_config; uint8_t mem_config;
memcpy(&mem_config, iclass_dump + 13,1); memcpy(&mem_config, iclass_dump + 13,1);
uint8_t maxmemcount; uint8_t maxmemcount;
@ -1270,18 +1269,19 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
startblock = 6; startblock = 6;
if ((endblock > maxmemcount) || (endblock == 0)) if ((endblock > maxmemcount) || (endblock == 0))
endblock = maxmemcount; endblock = maxmemcount;
if (endblock > filemaxblock)
// remember endblock need to relate to zero-index arrays.
if (endblock > filemaxblock-1)
endblock = filemaxblock; endblock = filemaxblock;
int i = startblock; int i = startblock;
int j; printf("------+--+-------------------------+\n");
while (i <= endblock){ while (i <= endblock) {
printf("Block |%02X| ",i); uint8_t *blk = iclass_dump + (i * 8);
memcpy(blockdata,iclass_dump + (i * 8),8); printf("Block |%02X| %s|\n", i, sprint_hex(blk, 8) );
for (j = 0;j < 8;j++)
printf("%02X ",blockdata[j]);
printf("|\n");
i++; i++;
} }
printf("------+--+-------------------------+\n");
} }
int usage_hf_iclass_readtagfile() { int usage_hf_iclass_readtagfile() {
@ -1327,7 +1327,8 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
size_t bytes_read = fread(dump, 1, fsize, f); size_t bytes_read = fread(dump, 1, fsize, f);
fclose(f); fclose(f);
uint8_t *csn = dump; uint8_t *csn = dump;
printf("CSN [00] | %02X %02X %02X %02X %02X %02X %02X %02X |\n",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]); printf("------+--+-------------------------+\n");
printf("CSN |00| %s|\n", sprint_hex(csn, 8) );
// printIclassDumpInfo(dump); // printIclassDumpInfo(dump);
printIclassDumpContents(dump,startblock,endblock,bytes_read); printIclassDumpContents(dump,startblock,endblock,bytes_read);
free(dump); free(dump);

17
client/cmdlf.c
View file

@ -38,7 +38,7 @@ static int CmdHelp(const char *Cmd);
int usage_lf_cmdread() int usage_lf_cmdread(void)
{ {
PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] "); PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");
PrintAndLog("Options: "); PrintAndLog("Options: ");
@ -430,7 +430,7 @@ int CmdIndalaClone(const char *Cmd)
return 0; return 0;
} }
int usage_lf_read() int usage_lf_read(void)
{ {
PrintAndLog("Usage: lf read"); PrintAndLog("Usage: lf read");
PrintAndLog("Options: "); PrintAndLog("Options: ");
@ -440,7 +440,7 @@ int usage_lf_read()
PrintAndLog("Use 'lf config' to set parameters."); PrintAndLog("Use 'lf config' to set parameters.");
return 0; return 0;
} }
int usage_lf_snoop() int usage_lf_snoop(void)
{ {
PrintAndLog("Usage: lf snoop"); PrintAndLog("Usage: lf snoop");
PrintAndLog("Options: "); PrintAndLog("Options: ");
@ -450,7 +450,7 @@ int usage_lf_snoop()
return 0; return 0;
} }
int usage_lf_config() int usage_lf_config(void)
{ {
PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]"); PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
PrintAndLog("Options: "); PrintAndLog("Options: ");
@ -685,7 +685,7 @@ int usage_lf_simpsk(void)
return 0; return 0;
} }
// by marshmellow - sim ask data given clock, fcHigh, fcLow, invert // by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert
// - allow pull data from DemodBuffer // - allow pull data from DemodBuffer
int CmdLFfskSim(const char *Cmd) int CmdLFfskSim(const char *Cmd)
{ {
@ -1180,6 +1180,13 @@ int CmdLFfind(const char *Cmd)
return 1; return 1;
} }
if (!offline && (cmdp != '1')){
ans=CmdLFHitagReader("26");
if (ans==0) {
return 1;
}
}
PrintAndLog("\nNo Known Tags Found!\n"); PrintAndLog("\nNo Known Tags Found!\n");
if (testRaw=='u' || testRaw=='U'){ if (testRaw=='u' || testRaw=='U'){
//test unknown tag formats (raw mode) //test unknown tag formats (raw mode)

66
client/cmdlfhitag.c
View file

@ -214,14 +214,19 @@ int CmdLFHitagReader(const char *Cmd) {
} break; } break;
case RHT2F_CRYPTO: { case RHT2F_CRYPTO: {
num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
// num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4); // num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4);
} break; } break;
case RHT2F_TEST_AUTH_ATTEMPTS: { case RHT2F_TEST_AUTH_ATTEMPTS: {
// No additional parameters needed // No additional parameters needed
} break; } break;
case RHT2F_UID_ONLY: {
// No additional parameters needed
} break;
default: { default: {
PrintAndLog("Error: unkown reader function %d",htf); PrintAndLog("\nError: unkown reader function %d",htf);
PrintAndLog("Hitag reader functions"); PrintAndLog("");
PrintAndLog("Usage: hitag reader <Reader Function #>");
PrintAndLog("Reader Functions:");
PrintAndLog(" HitagS (0*)"); PrintAndLog(" HitagS (0*)");
PrintAndLog(" 01 <nr> <ar> (Challenge) read all pages from a Hitag S tag"); PrintAndLog(" 01 <nr> <ar> (Challenge) read all pages from a Hitag S tag");
PrintAndLog(" 02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag"); PrintAndLog(" 02 <key> (set to 0 if no authentication is needed) read all pages from a Hitag S tag");
@ -231,6 +236,7 @@ int CmdLFHitagReader(const char *Cmd) {
PrintAndLog(" 22 <nr> <ar> (authentication)"); PrintAndLog(" 22 <nr> <ar> (authentication)");
PrintAndLog(" 23 <key> (authentication) key is in format: ISK high + ISK low"); PrintAndLog(" 23 <key> (authentication) key is in format: ISK high + ISK low");
PrintAndLog(" 25 (test recorded authentications)"); PrintAndLog(" 25 (test recorded authentications)");
PrintAndLog(" 26 just read UID");
return 1; return 1;
} break; } break;
} }
@ -238,32 +244,38 @@ int CmdLFHitagReader(const char *Cmd) {
// Copy the hitag2 function into the first argument // Copy the hitag2 function into the first argument
c.arg[0] = htf; c.arg[0] = htf;
// Send the command to the proxmark // Send the command to the proxmark
SendCommand(&c); SendCommand(&c);
UsbCommand resp;
WaitForResponse(CMD_ACK,&resp);
// Check the return status, stored in the first argument
if (resp.arg[0] == false) return 1;
uint32_t id = bytes_to_num(resp.d.asBytes,4);
char filename[256];
FILE* pf = NULL;
sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff)); UsbCommand resp;
if ((pf = fopen(filename,"wb")) == NULL) { WaitForResponse(CMD_ACK,&resp);
PrintAndLog("Error: Could not open file [%s]",filename);
return 1;
}
// Write the 48 tag memory bytes to file and finalize
fwrite(resp.d.asBytes,1,48,pf);
fclose(pf);
PrintAndLog("Succesfully saved tag memory to [%s]",filename); // Check the return status, stored in the first argument
if (resp.arg[0] == false) return 1;
return 0;
uint32_t id = bytes_to_num(resp.d.asBytes,4);
if (htf == RHT2F_UID_ONLY){
PrintAndLog("Valid Hitag2 tag found - UID: %08x",id);
} else {
char filename[256];
FILE* pf = NULL;
sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff));
if ((pf = fopen(filename,"wb")) == NULL) {
PrintAndLog("Error: Could not open file [%s]",filename);
return 1;
}
// Write the 48 tag memory bytes to file and finalize
fwrite(resp.d.asBytes,1,48,pf);
fclose(pf);
PrintAndLog("Succesfully saved tag memory to [%s]",filename);
}
return 0;
} }

5
include/hitag2.h
View file

@ -14,14 +14,15 @@
#define _HITAG2_H_ #define _HITAG2_H_
typedef enum { typedef enum {
RHTSF_CHALLENGE = 01, RHTSF_CHALLENGE = 01,
RHTSF_KEY = 02, RHTSF_KEY = 02,
WHTSF_CHALLENGE = 03, WHTSF_CHALLENGE = 03,
WHTSF_KEY = 04, WHTSF_KEY = 04,
RHT2F_PASSWORD = 21, RHT2F_PASSWORD = 21,
RHT2F_AUTHENTICATE = 22, RHT2F_AUTHENTICATE = 22,
RHT2F_CRYPTO = 23, RHT2F_CRYPTO = 23,
RHT2F_TEST_AUTH_ATTEMPTS = 25, RHT2F_TEST_AUTH_ATTEMPTS = 25,
RHT2F_UID_ONLY = 26
} hitag_function; } hitag_function;
typedef struct { typedef struct {