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

fix: high and low variable should now contain raw hex.

Browse source
This commit is contained in:
iceman1001 2017-10-29 11:20:10 +01:00
commit bc131dd105
3 changed files with 96 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

3
armsrc/appmain.c
View file

@ -614,7 +614,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
CopyIOtoT55x7(c->arg[0], c->arg[1]); CopyIOtoT55x7(c->arg[0], c->arg[1]);
break; break;
case CMD_EM410X_DEMOD: { case CMD_EM410X_DEMOD: {
uint32_t high, low; uint32_t high;
uint64_t low;
CmdEM410xdemod(c->arg[0], &high, &low, 1); CmdEM410xdemod(c->arg[0], &high, &low, 1);
break; break;
} }

2
armsrc/apps.h
View file

@ -89,7 +89,7 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream); void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26 void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); // Realtime demodulation mode for AWID26
void CmdEM410xdemod(int findone, uint32_t *high, uint32_t *low, int ledcontrol); void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol);
void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol); void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol);
void CopyIOtoT55x7(uint32_t hi, uint32_t lo); // Clone an ioProx card to T5557/T5567 void CopyIOtoT55x7(uint32_t hi, uint32_t lo); // Clone an ioProx card to T5557/T5567
void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT); // Clone an HID card to T5557/T5567 void CopyHIDtoT55x7(uint32_t hi2, uint32_t hi, uint32_t lo, uint8_t longFMT); // Clone an HID card to T5557/T5567

182
armsrc/lfops.c
View file

@ -634,7 +634,7 @@ void CmdHIDsimTAGEx( uint32_t hi, uint32_t lo, int ledcontrol, int numcycles) {
} }
void CmdHIDsimTAG( uint32_t hi, uint32_t lo, int ledcontrol) { void CmdHIDsimTAG( uint32_t hi, uint32_t lo, int ledcontrol) {
void CmdHIDsimTAG( hi, lo, ledcontrol, -1); void CmdHIDsimTAGEx( hi, lo, ledcontrol, -1);
} }
// prepare a waveform pattern in the buffer based on the ID given then // prepare a waveform pattern in the buffer based on the ID given then
@ -815,7 +815,7 @@ void CmdPSKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
} }
// loop to get raw HID waveform then FSK demodulate the TAG ID from it // loop to get raw HID waveform then FSK demodulate the TAG ID from it
void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol) { void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
uint8_t *dest = BigBuf_get_addr(); uint8_t *dest = BigBuf_get_addr();
size_t size = 0; size_t size = 0;
uint32_t hi2 = 0, hi = 0, lo = 0; uint32_t hi2 = 0, hi = 0, lo = 0;
@ -842,60 +842,61 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol) {
// go over previously decoded manchester data and decode into usable tag ID // go over previously decoded manchester data and decode into usable tag ID
if (hi2 != 0){ //extra large HID tags 88/192 bits if (hi2 != 0){ //extra large HID tags 88/192 bits
Dbprintf("TAG ID: %x%08x%08x (%d)", Dbprintf("TAG ID: %x%08x%08x (%d)",
(unsigned int) hi2, hi2,
(unsigned int) hi, hi,
(unsigned int) lo, lo,
(unsigned int) (lo>>1) & 0xFFFF (lo >> 1) & 0xFFFF
); );
} else { //standard HID tags 44/96 bits } else { //standard HID tags 44/96 bits
uint8_t bitlen = 0; uint8_t bitlen = 0;
uint32_t fc = 0; uint32_t fc = 0;
uint32_t cardnum = 0; uint32_t cardnum = 0;
if (((hi>>5)&1) == 1){//if bit 38 is set then < 37 bit format is used if (((hi >> 5) & 1) == 1){//if bit 38 is set then < 37 bit format is used
uint32_t lo2=0; uint32_t lo2 = 0;
lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
uint8_t idx3 = 1; uint8_t idx3 = 1;
while(lo2 > 1){ //find last bit set to 1 (format len bit) while (lo2 > 1){ //find last bit set to 1 (format len bit)
lo2=lo2 >> 1; lo2 >>= 1;
idx3++; idx3++;
} }
bitlen = idx3+19; bitlen = idx3 + 19;
fc =0; fc = 0;
cardnum=0; cardnum = 0;
if(bitlen == 26){ if (bitlen == 26){
cardnum = (lo>>1)&0xFFFF; cardnum = (lo >> 1) & 0xFFFF;
fc = (lo>>17)&0xFF; fc = (lo >> 17) & 0xFF;
} }
if(bitlen == 37){ if (bitlen == 37){
cardnum = (lo>>1)&0x7FFFF; cardnum = (lo >> 1 ) & 0x7FFFF;
fc = ((hi&0xF)<<12)|(lo>>20); fc = ((hi & 0xF) << 12) | (lo >> 20);
} }
if(bitlen == 34){ if (bitlen == 34){
cardnum = (lo>>1)&0xFFFF; cardnum = (lo >> 1) & 0xFFFF;
fc= ((hi&1)<<15)|(lo>>17); fc = ((hi & 1) << 15) | (lo >> 17);
} }
if(bitlen == 35){ if (bitlen == 35){
cardnum = (lo>>1)&0xFFFFF; cardnum = (lo >> 1) & 0xFFFFF;
fc = ((hi&1)<<11)|(lo>>21); fc = ((hi & 1) << 11)|(lo >> 21);
} }
} }
else { //if bit 38 is not set then 37 bit format is used else { //if bit 38 is not set then 37 bit format is used
bitlen= 37; bitlen= 37;
fc =0; fc = 0;
cardnum=0; cardnum = 0;
if(bitlen==37){ if (bitlen == 37){
cardnum = (lo>>1)&0x7FFFF; cardnum = (lo >> 1) & 0x7FFFF;
fc = ((hi&0xF)<<12)|(lo>>20); fc = ((hi & 0xF) << 12) | (lo >> 20);
} }
} }
Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d", Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
(unsigned int) hi, hi,
(unsigned int) lo, lo,
(unsigned int) (lo>>1) & 0xFFFF, (lo >> 1) & 0xFFFF,
(unsigned int) bitlen, bitlen,
(unsigned int) fc, fc,
(unsigned int) cardnum); cardnum
);
} }
if (findone){ if (findone){
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
@ -914,12 +915,16 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol) {
// loop to get raw HID waveform then FSK demodulate the TAG ID from it // loop to get raw HID waveform then FSK demodulate the TAG ID from it
void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) { void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
uint8_t *dest = BigBuf_get_addr(); uint8_t *dest = BigBuf_get_addr();
size_t size;
int idx=0, dummyIdx=0; //big enough to catch 2 sequences of largest format
//clear read buffer size_t size = 12800; //50 * 128 * 2;
int idx = 0, dummyIdx = 0;
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();
// Configure to go in 125Khz listen mode
LFSetupFPGAForADC(95, true); LFSetupFPGAForADC(95, true);
while(!BUTTON_PRESS() && !usb_poll_validate_length()) { while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
@ -927,12 +932,12 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
WDT_HIT(); WDT_HIT();
if (ledcontrol) LED_A_ON(); if (ledcontrol) LED_A_ON();
DoAcquisition_default(-1,true); DoAcquisition_default(-1, true);
// FSK demodulator // FSK demodulator
size = 50*128*2; //big enough to catch 2 sequences of largest format
idx = detectAWID(dest, &size, &dummyIdx); idx = detectAWID(dest, &size, &dummyIdx);
if (idx<=0 || size!=96) continue; if (idx <= 0 || size != 96) continue;
// Index map // Index map
// 0 10 20 30 40 50 60 // 0 10 20 30 40 50 60
// | | | | | | | // | | | | | | |
@ -947,9 +952,9 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
// (26 bit format shown) // (26 bit format shown)
//get raw ID before removing parities //get raw ID before removing parities
uint32_t rawLo = bytebits_to_byte(dest+idx+64,32); uint32_t rawLo = bytebits_to_byte(dest+idx+64, 32);
uint32_t rawHi = bytebits_to_byte(dest+idx+32,32); uint32_t rawHi = bytebits_to_byte(dest+idx+32, 32);
uint32_t rawHi2 = bytebits_to_byte(dest+idx,32); uint32_t rawHi2 = bytebits_to_byte(dest+idx, 32);
size = removeParity(dest, idx+8, 4, 1, 88); size = removeParity(dest, idx+8, 4, 1, 88);
if (size != 66) continue; if (size != 66) continue;
@ -972,27 +977,27 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
uint32_t cardnum = 0; uint32_t cardnum = 0;
uint32_t code1 = 0; uint32_t code1 = 0;
uint32_t code2 = 0; uint32_t code2 = 0;
uint8_t fmtLen = bytebits_to_byte(dest,8); uint8_t fmtLen = bytebits_to_byte(dest, 8);
if (fmtLen==26){ if (fmtLen == 26){
fc = bytebits_to_byte(dest+9, 8); fc = bytebits_to_byte(dest+9, 8);
cardnum = bytebits_to_byte(dest+17, 16); cardnum = bytebits_to_byte(dest+17, 16);
code1 = bytebits_to_byte(dest+8,fmtLen); code1 = bytebits_to_byte(dest+8, fmtLen);
Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
} else { } else {
cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16); cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
if (fmtLen>32){ if (fmtLen > 32){
code1 = bytebits_to_byte(dest+8,fmtLen-32); code1 = bytebits_to_byte(dest+8, fmtLen-32);
code2 = bytebits_to_byte(dest+8+(fmtLen-32),32); code2 = bytebits_to_byte(dest+8+(fmtLen-32), 32);
Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
} else{ } else{
code1 = bytebits_to_byte(dest+8,fmtLen); code1 = bytebits_to_byte(dest+8, fmtLen);
Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
} }
} }
if (findone){ if (findone){
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high = hi; *high = rawHi;
*low = lo; *low = rawLo;
break; break;
} }
// reset // reset
@ -1004,16 +1009,16 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
void CmdEM410xdemod(int findone, uint32_t *high, uint32_t *low, int ledcontrol) { void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol) {
uint8_t *dest = BigBuf_get_addr(); uint8_t *dest = BigBuf_get_addr();
size_t size=0, idx=0; size_t size = 0, idx = 0;
int clk=0, invert=0, errCnt=0, maxErr=20; int clk = 0, invert = 0, errCnt = 0, maxErr = 20;
uint32_t hi=0; uint32_t hi = 0;
uint64_t lo=0; uint64_t lo = 0;
//clear read buffer
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();
// Configure to go in 125Khz listen mode
LFSetupFPGAForADC(95, true); LFSetupFPGAForADC(95, true);
while(!BUTTON_PRESS() && !usb_poll_validate_length()) { while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
@ -1021,31 +1026,31 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
WDT_HIT(); WDT_HIT();
if (ledcontrol) LED_A_ON(); if (ledcontrol) LED_A_ON();
DoAcquisition_default(-1,true); DoAcquisition_default(-1, true);
size = BigBuf_max_traceLen(); size = BigBuf_max_traceLen();
//askdemod and manchester decode //askdemod and manchester decode
if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format if (size > 16385) size = 16385; //big enough to catch 2 sequences of largest format
errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1); errCnt = askdemod(dest, &size, &clk, &invert, maxErr, 0, 1);
WDT_HIT(); WDT_HIT();
if (errCnt<0) continue; if (errCnt < 0) continue;
errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo); errCnt = Em410xDecode(dest, &size, &idx, &hi, &lo);
if (errCnt){ if (errCnt){
if (size == 128){ if (size == 128){
Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)", Dbprintf("EM XL TAG ID: %06x%08x%08x - (%05d_%03d_%08d)",
hi, hi,
(uint32_t)(lo>>32), (uint32_t)(lo >> 32),
(uint32_t)lo, (uint32_t)lo,
(uint32_t)(lo&0xFFFF), (uint32_t)(lo & 0xFFFF),
(uint32_t)((lo>>16LL) & 0xFF), (uint32_t)((lo >> 16LL) & 0xFF),
(uint32_t)(lo & 0xFFFFFF)); (uint32_t)(lo & 0xFFFFFF));
} else { } else {
Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)", Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",
(uint32_t)(lo>>32), (uint32_t)(lo >> 32),
(uint32_t)lo, (uint32_t)lo,
(uint32_t)(lo&0xFFFF), (uint32_t)(lo & 0xFFFF),
(uint32_t)((lo>>16LL) & 0xFF), (uint32_t)((lo >> 16LL) & 0xFF),
(uint32_t)(lo & 0xFFFFFF)); (uint32_t)(lo & 0xFFFFFF));
} }
@ -1066,15 +1071,14 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
} }
void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) { void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
uint8_t *dest = BigBuf_get_addr(); uint8_t *dest = BigBuf_get_addr();
int dummyIdx = 0;
int idx = 0; int dummyIdx = 0, idx = 0;
uint32_t code = 0, code2 = 0; uint32_t code = 0, code2 = 0;
uint8_t version = 0; uint8_t version = 0, facilitycode = 0, crc = 0;
uint8_t facilitycode = 0; uint16_t number = 0, calccrc = 0;
uint16_t number = 0;
uint8_t crc = 0;
uint16_t calccrc = 0;
size_t size = BigBuf_max_traceLen(); size_t size = BigBuf_max_traceLen();
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();
@ -1119,26 +1123,26 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
// Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]); // Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
// Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]); // Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
// } // }
code = bytebits_to_byte(dest+idx,32); code = bytebits_to_byte(dest+idx, 32);
code2 = bytebits_to_byte(dest+idx+32,32); code2 = bytebits_to_byte(dest+idx+32, 32);
version = bytebits_to_byte(dest+idx+27,8); //14,4 version = bytebits_to_byte(dest+idx+27, 8); //14,4
facilitycode = bytebits_to_byte(dest+idx+18,8); facilitycode = bytebits_to_byte(dest+idx+18, 8);
number = (bytebits_to_byte(dest+idx+36,8)<<8)|(bytebits_to_byte(dest+idx+45,8)); //36,9 number = (bytebits_to_byte(dest+idx+36, 8) << 8) | (bytebits_to_byte(dest+idx+45, 8)); //36,9
crc = bytebits_to_byte(dest+idx+54,8); crc = bytebits_to_byte(dest+idx+54, 8);
for (uint8_t i=1; i<6; ++i) for (uint8_t i=1; i<6; ++i)
calccrc += bytebits_to_byte(dest+idx+9*i,8); calccrc += bytebits_to_byte(dest+idx+9*i, 8);
calccrc &= 0xff; calccrc &= 0xff;
calccrc = 0xff - calccrc; calccrc = 0xff - calccrc;
char *crcStr = (crc == calccrc) ? "ok":"!crc"; char *crcStr = (crc == calccrc) ? "ok" : "!crc";
Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr); Dbprintf("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]", version, facilitycode, number, code, code2, crc, crcStr);
// if we're only looking for one tag // if we're only looking for one tag
if (findone){ if (findone){
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high = hi; *high = code;
*low = lo; *low = code2;
break; break;
} }
code = code2 = 0; code = code2 = 0;