#include "../include/proxmark3.h"
#include "apps.h"
#include "util.h"
-#include "../include/hitag2.h"
#include "../common/crc16.h"
+#include "../common/lfdemod.h"
#include "string.h"
#include "crapto1.h"
-#include "mifareutil.h"
+#include "mifareutil.h"
+#include "../include/hitag2.h"
// Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
// TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
LED_A_OFF();
}
-size_t fsk_demod(uint8_t * dest, size_t size)
-{
- uint32_t last_transition = 0;
- uint32_t idx = 1;
-
- // we don't care about actual value, only if it's more or less than a
- // threshold essentially we capture zero crossings for later analysis
- uint8_t threshold_value = 127;
-
- // sync to first lo-hi transition, and threshold
-
- //Need to threshold first sample
- dest[0] = (dest[0] < threshold_value) ? 0 : 1;
-
- size_t numBits = 0;
- // count cycles between consecutive lo-hi transitions, there should be either 8 (fc/8)
- // or 10 (fc/10) cycles but in practice due to noise etc we may end up with with anywhere
- // between 7 to 11 cycles so fuzz it by treat anything <9 as 8 and anything else as 10
- for(idx = 1; idx < size; idx++) {
- // threshold current value
- dest[idx] = (dest[idx] < threshold_value) ? 0 : 1;
-
- // Check for 0->1 transition
- if (dest[idx-1] < dest[idx]) { // 0 -> 1 transition
-
- dest[numBits] = (idx-last_transition < 9) ? 1 : 0;
- last_transition = idx;
- numBits++;
- }
- }
- return numBits; //Actually, it returns the number of bytes, but each byte represents a bit: 1 or 0
-}
-
-
-size_t aggregate_bits(uint8_t *dest,size_t size, uint8_t h2l_crossing_value,uint8_t l2h_crossing_value, uint8_t maxConsequtiveBits, uint8_t invert )
-{
- uint8_t lastval=dest[0];
- uint32_t idx=0;
- size_t numBits=0;
- uint32_t n=1;
-
- for( idx=1; idx < size; idx++) {
-
- if (dest[idx]==lastval) {
- n++;
- continue;
- }
- //if lastval was 1, we have a 1->0 crossing
- if ( dest[idx-1] ) {
- n=(n+1) / h2l_crossing_value;
- } else {// 0->1 crossing
- n=(n+1) / l2h_crossing_value;
- }
- if (n == 0) n = 1;
-
- if(n < maxConsequtiveBits)
- {
- if ( invert==0)
- memset(dest+numBits, dest[idx-1] , n);
- else
- memset(dest+numBits, dest[idx-1]^1 , n);
-
- numBits += n;
- }
- n=0;
- lastval=dest[idx];
- }//end for
-
- return numBits;
-
-}
-// loop to capture 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)
{
uint8_t *dest = get_bigbufptr_recvrespbuf();
- size_t size=0,idx=0; //, found=0;
+ size_t size=0; //, found=0;
uint32_t hi2=0, hi=0, lo=0;
// Configure to go in 125Khz listen mode
if (ledcontrol) LED_A_ON();
DoAcquisition125k_internal(-1,true);
-
+ size = sizeof(BigBuf);
+ if (size < 2000) continue;
// FSK demodulator
- size = fsk_demod(dest, FREE_BUFFER_SIZE);
- // we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
- // 1->0 : fc/8 in sets of 6 (RF/50 / 8 = 6.25)
- // 0->1 : fc/10 in sets of 5 (RF/50 / 10= 5)
- // do not invert
- size = aggregate_bits(dest,size, 6,5,5,0);
+ int bitLen = HIDdemodFSK(dest,size,&hi2,&hi,&lo);
WDT_HIT();
+ if (bitLen>0 && lo>0){
// final loop, go over previously decoded manchester data and decode into usable tag ID
// 111000 bit pattern represent start of frame, 01 pattern represents a 1 and 10 represents a 0
- uint8_t frame_marker_mask[] = {1,1,1,0,0,0};
- int numshifts = 0;
- idx = 0;
- while( idx + sizeof(frame_marker_mask) < size) {
- // search for a start of frame marker
- if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
- { // frame marker found
- idx+=sizeof(frame_marker_mask);
-
- while(dest[idx] != dest[idx+1] && idx < size-2)
- {
- // Keep going until next frame marker (or error)
- // Shift in a bit. Start by shifting high registers
- hi2=(hi2<<1)|(hi>>31);
- hi=(hi<<1)|(lo>>31);
- //Then, shift in a 0 or one into low
- if (dest[idx] && !dest[idx+1]) // 1 0
- lo=(lo<<1)|0;
- else // 0 1
- lo=(lo<<1)|
- 1;
- numshifts ++;
- idx += 2;
- }
- //Dbprintf("Num shifts: %d ", numshifts);
- // Hopefully, we read a tag and hit upon the next frame marker
- if(idx + sizeof(frame_marker_mask) < size)
- {
- if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
- {
if (hi2 != 0){ //extra large HID tags
Dbprintf("TAG ID: %x%08x%08x (%d)",
(unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
- }
- else { //standard HID tags <38 bits
+ }else { //standard HID tags <38 bits
//Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd
uint8_t bitlen = 0;
uint32_t fc = 0;
if (findone){
if (ledcontrol) LED_A_OFF();
return;
- }
- }
}
// reset
hi2 = hi = lo = 0;
- numshifts = 0;
- } else {
- idx++;
- }
}
WDT_HIT();
-
- }
+ //SpinDelay(50);
+ }
DbpString("Stopped");
if (ledcontrol) LED_A_OFF();
}
-uint32_t bytebits_to_byte(uint8_t* src, int numbits)
+void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
{
- uint32_t num = 0;
- for(int i = 0 ; i < numbits ; i++)
- {
- num = (num << 1) | (*src);
- src++;
+ uint8_t *dest = (uint8_t *)BigBuf;
+
+ size_t size=0; //, found=0;
+ uint32_t bitLen=0;
+ int clk=0, invert=0, errCnt=0;
+ uint64_t lo=0;
+ // Configure to go in 125Khz listen mode
+ LFSetupFPGAForADC(95, true);
+
+ while(!BUTTON_PRESS()) {
+
+ WDT_HIT();
+ if (ledcontrol) LED_A_ON();
+
+ DoAcquisition125k_internal(-1,true);
+ size = sizeof(BigBuf);
+ if (size < 2000) continue;
+ // FSK demodulator
+ //int askmandemod(uint8_t *BinStream,uint32_t *BitLen,int *clk, int *invert);
+ bitLen=size;
+ //Dbprintf("DEBUG: Buffer got");
+ errCnt = askmandemod(dest,&bitLen,&clk,&invert); //HIDdemodFSK(dest,size,&hi2,&hi,&lo);
+ //Dbprintf("DEBUG: ASK Got");
+ WDT_HIT();
+
+ if (errCnt>=0){
+ lo = Em410xDecode(dest,bitLen);
+ //Dbprintf("DEBUG: EM GOT");
+ //printEM410x(lo);
+ if (lo>0){
+ Dbprintf("EM TAG ID: %02x%08x - (%05d_%03d_%08d)",(uint32_t)(lo>>32),(uint32_t)lo,(uint32_t)(lo&0xFFFF),(uint32_t)((lo>>16LL) & 0xFF),(uint32_t)(lo & 0xFFFFFF));
+ }
+ if (findone){
+ if (ledcontrol) LED_A_OFF();
+ return;
+ }
+ } else {
+ //Dbprintf("DEBUG: No Tag");
+ }
+ WDT_HIT();
+ lo = 0;
+ clk=0;
+ invert=0;
+ errCnt=0;
+ size=0;
+ //SpinDelay(50);
}
- return num;
+ DbpString("Stopped");
+ if (ledcontrol) LED_A_OFF();
}
-
void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
{
uint8_t *dest = (uint8_t *)BigBuf;
- size_t size=0, idx=0;
+ size_t size=0;
+ int idx=0;
uint32_t code=0, code2=0;
- uint8_t isFinish = 0;
-
+ uint8_t version=0;
+ uint8_t facilitycode=0;
+ uint16_t number=0;
// Configure to go in 125Khz listen mode
LFSetupFPGAForADC(0, true);
- while(!BUTTON_PRESS() & !isFinish) {
+ while(!BUTTON_PRESS()) {
WDT_HIT();
DoAcquisition125k_internal(-1,true);
size = sizeof(BigBuf);
-
- // FSK demodulator
- size = fsk_demod(dest, size);
- // we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
- // 1->0 : fc/8 in sets of 7 (RF/64 / 8 = 8)
- // 0->1 : fc/10 in sets of 6 (RF/64 / 10 = 6.4)
- size = aggregate_bits(dest, size, 7,6,13,1); //13 max Consecutive should be ok as most 0s in row should be 10 for init seq - invert bits
+ //make sure buffer has data
+ if (size < 2000) continue;
+ //fskdemod and get start index
+ WDT_HIT();
+ idx = IOdemodFSK(dest,size);
+ if (idx>0){
+ //valid tag found
//Index map
//0 10 20 30 40 50 60
//
//XSF(version)facility:codeone+codetwo
//Handle the data
-
- uint8_t mask[] = {0,0,0,0,0,0,0,0,0,1};
-
- for( idx=0; idx < (size - 64); idx++) {
- if ( memcmp(dest + idx, mask, sizeof(mask))==0) {
- //frame marker found
if(findone){ //only print binary if we are doing one
Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx], dest[idx+1], dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);
}
code = bytebits_to_byte(dest+idx,32);
code2 = bytebits_to_byte(dest+idx+32,32);
- short version = bytebits_to_byte(dest+idx+28,8); //14,4
- char facilitycode = bytebits_to_byte(dest+idx+19,8) ;
- uint16_t number = (bytebits_to_byte(dest+idx+37,8)<<8)|(bytebits_to_byte(dest+idx+46,8)); //36,9
+ version = bytebits_to_byte(dest+idx+27,8); //14,4
+ 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
- Dbprintf("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);
-
+ Dbprintf("XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);
// if we're only looking for one tag
if (findone){
if (ledcontrol) LED_A_OFF();
- isFinish = 1;
- break;
- }
+ return;
}
+ code=code2=0;
+ version=facilitycode=0;
+ number=0;
+ idx=0;
}
WDT_HIT();
}
dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
++i;
LED_D_OFF();
- if (i > bufferlength) break;
+ if (i >= bufferlength) break;
}
}
projects / proxmark3-svn / blobdiff