]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merged with master
authorMartin Holst Swende <martin.holst@gmail.com>
Fri, 27 Jun 2014 11:16:31 +0000 (13:16 +0200)
committerMartin Holst Swende <martin.holst@gmail.com>
Fri, 27 Jun 2014 11:16:31 +0000 (13:16 +0200)
1  2 
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
armsrc/iso14443a.c

diff --combined armsrc/appmain.c
index 30e5ac53c4745fbaa24587a3bdd672932571ed2e,8c224b6a1481c073e04421433c986e6db511b9a2..2061f6b3efb758fb4817cf54f0f2cd4c082a88b9
@@@ -214,7 -214,8 +214,8 @@@ void MeasureAntennaTuning(void
   * ( hopefully around 95 if it is tuned to 125kHz!)
   */
    
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
        for (i=255; i>19; i--) {
      WDT_HIT();
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
  
    LED_A_ON();
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);
        // Vref = 3300mV, and an 10:1 voltage divider on the input
@@@ -264,6 -266,7 +266,7 @@@ void MeasureAntennaTuningHf(void
  
        for (;;) {
                // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
+               FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
                FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
                SpinDelay(20);
                // Vref = 3300mV, and an 10:1 voltage divider on the input
@@@ -286,6 -289,7 +289,7 @@@ void SimulateTagHfListen(void
  
        // We're using this mode just so that I can test it out; the simulated
        // tag mode would work just as well and be simpler.
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
  
        // We need to listen to the high-frequency, peak-detected path.
@@@ -365,6 -369,7 +369,7 @@@ void SendVersion(void
  void SamyRun()
  {
        DbpString("Stand-alone mode! No PC necessary.");
+       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
  
        // 3 possible options? no just 2 for now
  #define OPTS 2
@@@ -633,6 -638,10 +638,10 @@@ void UsbPacketReceived(uint8_t *packet
                case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
                        break;
+               case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
+                       SnoopLFRawAdcSamples(c->arg[0], c->arg[1]);
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+                       break;
                case CMD_HID_DEMOD_FSK:
                        CmdHIDdemodFSK(0, 0, 0, 1);                                     // Demodulate HID tag
                        break;
                        SnoopIClass();
                        break;
                case CMD_SIMULATE_TAG_ICLASS:
 -                      SimulateIClass(c->arg[0], c->d.asBytes);
 +                      SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_READER_ICLASS:
                        ReaderIClass(c->arg[0]);
                        break;
  
                case CMD_SET_LF_DIVISOR:
+                       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
                        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, c->arg[0]);
                        break;
  
@@@ -1017,7 -1027,8 +1027,8 @@@ void  __attribute__((noreturn)) AppMain
        AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
  
        // Load the FPGA image, which we have stored in our flash.
-       FpgaDownloadAndGo();
+       // (the HF version by default)
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
  
        StartTickCount();
        
diff --combined armsrc/apps.h
index c6520702a852a4c0f91718c86d3089687371021d,4c7fa19006e5d3a684ba77e315b42653f516aed5..aaa7d56f70536ca56a834e7cc40379c42c9c101a
@@@ -59,7 -59,8 +59,8 @@@ void ToSendStuffBit(int b)
  void ToSendReset(void);
  void ListenReaderField(int limit);
  void AcquireRawAdcSamples125k(int at134khz);
- void DoAcquisition125k(void);
+ void SnoopLFRawAdcSamples(int divisor, int trigger_threshold);
+ void DoAcquisition125k(int trigger_threshold);
  extern int ToSendMax;
  extern uint8_t ToSend[];
  extern uint32_t BigBuf[];
@@@ -67,7 -68,8 +68,8 @@@
  /// fpga.h
  void FpgaSendCommand(uint16_t cmd, uint16_t v);
  void FpgaWriteConfWord(uint8_t v);
- void FpgaDownloadAndGo(void);
+ void FpgaDownloadAndGo(int bitstream_version);
+ int FpgaGatherBitstreamVersion();
  void FpgaGatherVersion(char *dst, int len);
  void FpgaSetupSsc(void);
  void SetupSpi(int mode);
@@@ -77,17 -79,22 +79,22 @@@ bool FpgaSetupSscDma(uint8_t *buf, int 
  void SetAdcMuxFor(uint32_t whichGpio);
  
  // Definitions for the FPGA commands.
- #define FPGA_CMD_SET_CONFREG                                          (1<<12)
- #define FPGA_CMD_SET_DIVISOR                                          (2<<12)
+ #define FPGA_CMD_SET_CONFREG                                  (1<<12)
+ #define FPGA_CMD_SET_DIVISOR                                  (2<<12)
  // Definitions for the FPGA configuration word.
- #define FPGA_MAJOR_MODE_LF_READER                                     (0<<5)
- #define FPGA_MAJOR_MODE_LF_EDGE_DETECT                                (1<<5)
- #define FPGA_MAJOR_MODE_HF_READER_TX                          (2<<5)
- #define FPGA_MAJOR_MODE_HF_READER_RX_XCORR                    (3<<5)
- #define FPGA_MAJOR_MODE_HF_SIMULATOR                          (4<<5)
- #define FPGA_MAJOR_MODE_HF_ISO14443A                          (5<<5)
- #define FPGA_MAJOR_MODE_LF_PASSTHRU                                   (6<<5)
- #define FPGA_MAJOR_MODE_OFF                                                   (7<<5)
+ // LF
+ #define FPGA_MAJOR_MODE_LF_ADC                                        (0<<5)
+ #define FPGA_MAJOR_MODE_LF_EDGE_DETECT                        (1<<5)
+ #define FPGA_MAJOR_MODE_LF_PASSTHRU                           (2<<5)
+ // HF
+ #define FPGA_MAJOR_MODE_HF_READER_TX                          (0<<5)
+ #define FPGA_MAJOR_MODE_HF_READER_RX_XCORR                    (1<<5)
+ #define FPGA_MAJOR_MODE_HF_SIMULATOR                          (2<<5)
+ #define FPGA_MAJOR_MODE_HF_ISO14443A                          (3<<5)
+ // BOTH
+ #define FPGA_MAJOR_MODE_OFF                                   (7<<5)
+ // Options for LF_ADC
+ #define FPGA_LF_ADC_READER_FIELD                              (1<<0)
  // Options for LF_EDGE_DETECT
  #define FPGA_LF_EDGE_DETECT_READER_FIELD                      (1<<0)
  // Options for the HF reader, tx to tag
  // Options for the HF reader, correlating against rx from tag
  #define FPGA_HF_READER_RX_XCORR_848_KHZ                               (1<<0)
  #define FPGA_HF_READER_RX_XCORR_SNOOP                         (1<<1)
- #define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ          (1<<2)
+ #define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ                  (1<<2)
  // Options for the HF simulated tag, how to modulate
  #define FPGA_HF_SIMULATOR_NO_MODULATION                               (0<<0)
  #define FPGA_HF_SIMULATOR_MODULATE_BPSK                               (1<<0)
  #define FPGA_HF_SIMULATOR_MODULATE_212K                               (2<<0)
  #define FPGA_HF_SIMULATOR_MODULATE_424K                               (4<<0)
  // Options for ISO14443A
- #define FPGA_HF_ISO14443A_SNIFFER                                     (0<<0)
+ #define FPGA_HF_ISO14443A_SNIFFER                             (0<<0)
  #define FPGA_HF_ISO14443A_TAGSIM_LISTEN                               (1<<0)
  #define FPGA_HF_ISO14443A_TAGSIM_MOD                          (2<<0)
  #define FPGA_HF_ISO14443A_READER_LISTEN                               (3<<0)
@@@ -147,7 -154,7 +154,7 @@@ void RAMFUNC SnoopIso14443a(uint8_t par
  void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);
  void ReaderIso14443a(UsbCommand * c);
  // Also used in iclass.c
 -bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t iSamples, uint32_t dwParity, bool bReader);
 +bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t iSamples, uint32_t dwParity, bool readerToTag);
  uint32_t GetParity(const uint8_t * pbtCmd, int iLen);
  void iso14a_set_trigger(bool enable);
  void iso14a_clear_trace();
@@@ -189,9 -196,9 +196,9 @@@ void SetDebugIso15693(uint32_t flag)
  
  /// iclass.h
  void RAMFUNC SnoopIClass(void);
 -void SimulateIClass(uint8_t arg0, uint8_t *datain);
 +void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
  void ReaderIClass(uint8_t arg0);
 -
 +//int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived);
  // hitag2.h
  void SnoopHitag(uint32_t type);
  void SimulateHitagTag(bool tag_mem_supplied, byte_t* data);
diff --combined armsrc/iclass.c
index be27aa3ad6d11ed9f13fd8c2b7f4c7e22a3624bc,9c5e8b2bef03751e637f77e75e5b9ed30debcc59..d5cd366dad9c1288403579b271739a21cb873928
  
  static int timeout = 4096;
  
 -// CARD TO READER
 -// Sequence D: 11110000 modulation with subcarrier during first half
 -// Sequence E: 00001111 modulation with subcarrier during second half
 -// Sequence F: 00000000 no modulation with subcarrier
 -// READER TO CARD
 -// Sequence X: 00001100 drop after half a period
 -// Sequence Y: 00000000 no drop
 -// Sequence Z: 11000000 drop at start
 -#define       SEC_X 0x0c
 -#define       SEC_Y 0x00
 -#define       SEC_Z 0xc0
  
  static int SendIClassAnswer(uint8_t *resp, int respLen, int delay);
  
@@@ -655,7 -666,12 +655,7 @@@ static RAMFUNC int ManchesterDecoding(i
  //-----------------------------------------------------------------------------
  void RAMFUNC SnoopIClass(void)
  {
 -// DEFINED ABOVE
 -// #define RECV_CMD_OFFSET   3032
 -// #define RECV_RES_OFFSET   3096
 -// #define DMA_BUFFER_OFFSET 3160
 -// #define DMA_BUFFER_SIZE   4096
 -// #define TRACE_SIZE        3000
 +
  
      // We won't start recording the frames that we acquire until we trigger;
      // a good trigger condition to get started is probably when we see a
      // The command (reader -> tag) that we're receiving.
        // The length of a received command will in most cases be no more than 18 bytes.
        // So 32 should be enough!
 -    uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
 +      uint8_t *readerToTagCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
      // The response (tag -> reader) that we're receiving.
 -    uint8_t *receivedResponse = (((uint8_t *)BigBuf) + RECV_RES_OFFSET);
 +      uint8_t *tagToReaderResponse = (((uint8_t *)BigBuf) + RECV_RES_OFFSET);
  
 -    // As we receive stuff, we copy it from receivedCmd or receivedResponse
 -    // into trace, along with its length and other annotations.
 -    //uint8_t *trace = (uint8_t *)BigBuf;
 -    
+     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+  
      // reset traceLen to 0
      iso14a_set_tracing(TRUE);
      iso14a_clear_trace();
      int samples = 0;
      rsamples = 0;
  
 -    memset(trace, 0x44, RECV_CMD_OFFSET);
 -
      // Set up the demodulator for tag -> reader responses.
 -    Demod.output = receivedResponse;
 +      Demod.output = tagToReaderResponse;
      Demod.len = 0;
      Demod.state = DEMOD_UNSYNCD;
  
  
      // And the reader -> tag commands
      memset(&Uart, 0, sizeof(Uart));
 -    Uart.output = receivedCmd;
 +      Uart.output = readerToTagCmd;
      Uart.byteCntMax = 32; // was 100 (greg)////////////////////////////////////////////////////////////////////////
      Uart.state = STATE_UNSYNCD;
  
      FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_SNIFFER);
      SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
  
 +      uint32_t time_0 = GetCountSspClk();
 +
 +
      int div = 0;
      //int div2 = 0;
      int decbyte = 0;
  
          //samples += 4;
        samples += 1;
 -      //div2++;       
  
 -      //if(div2 > 3) {
 -              //div2 = 0;
 -      //decbyte ^= ((smpl & 0x01) << (3 - div));
 -      //decbyte ^= (((smpl & 0x01) | ((smpl & 0x02) >> 1)) << (3 - div)); // better already...
 -      //decbyte ^= (((smpl & 0x01) | ((smpl & 0x02) >> 1) | ((smpl & 0x04) >> 2)) << (3 - div)); // even better...
        if(smpl & 0xF) {
                decbyte ^= (1 << (3 - div));
        }
 -      //decbyte ^= (MajorityNibble[(smpl & 0x0F)] << (3 - div));
        
        // FOR READER SIDE COMMUMICATION...
 -      //decbyte ^=  ((smpl & 0x10) << (3 - div));
 +
        decbyter <<= 2;
        decbyter ^= (smpl & 0x30);
  
                if(OutOfNDecoding((smpl & 0xF0) >> 4)) {
                    rsamples = samples - Uart.samples;
                    LED_C_ON();
 -                  //if(triggered) {
 -                      trace[traceLen++] = ((rsamples >>  0) & 0xff);
 -                      trace[traceLen++] = ((rsamples >>  8) & 0xff);
 -                      trace[traceLen++] = ((rsamples >> 16) & 0xff);
 -                      trace[traceLen++] = ((rsamples >> 24) & 0xff);
 -                      trace[traceLen++] = ((Uart.parityBits >>  0) & 0xff);
 -                      trace[traceLen++] = ((Uart.parityBits >>  8) & 0xff);
 -                      trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff);
 -                      trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff);
 -                      trace[traceLen++] = Uart.byteCnt;
 -                      memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
 -                      traceLen += Uart.byteCnt;
 -                      if(traceLen > TRACE_SIZE) break;
 -                  //}
 -                  /* And ready to receive another command. */
 +
 +                      //if(!LogTrace(Uart.output,Uart.byteCnt, rsamples, Uart.parityBits,TRUE)) break;
 +                      //if(!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, TRUE)) break;
 +                      if(tracing)
 +                      {
 +                              LogTrace(Uart.output,Uart.byteCnt, (GetCountSspClk()-time_0) << 4, Uart.parityBits,TRUE);
 +                              LogTrace(NULL, 0, (GetCountSspClk()-time_0) << 4, 0, TRUE);
 +                      }
 +
 +
 +                      /* And ready to receive another command. */
                    Uart.state = STATE_UNSYNCD;
                    /* And also reset the demod code, which might have been */
                    /* false-triggered by the commands from the reader. */
                    rsamples = samples - Demod.samples;
                    LED_B_ON();
  
 -                  // timestamp, as a count of samples
 -                  trace[traceLen++] = ((rsamples >>  0) & 0xff);
 -                  trace[traceLen++] = ((rsamples >>  8) & 0xff);
 -                  trace[traceLen++] = ((rsamples >> 16) & 0xff);
 -                  trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff);
 -                  trace[traceLen++] = ((Demod.parityBits >>  0) & 0xff);
 -                  trace[traceLen++] = ((Demod.parityBits >>  8) & 0xff);
 -                  trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff);
 -                  trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff);
 -                  // length
 -                  trace[traceLen++] = Demod.len;
 -                  memcpy(trace+traceLen, receivedResponse, Demod.len);
 -                  traceLen += Demod.len;
 -                  if(traceLen > TRACE_SIZE) break;
 -
 -                  //triggered = TRUE;
 +                      if(tracing)
 +                      {
 +                              LogTrace(Demod.output,Demod.len, (GetCountSspClk()-time_0) << 4 , Demod.parityBits,FALSE);
 +                              LogTrace(NULL, 0, (GetCountSspClk()-time_0) << 4, 0, FALSE);
 +                      }
 +
  
                    // And ready to receive another response.
                    memset(&Demod, 0, sizeof(Demod));
 -                  Demod.output = receivedResponse;
 +                      Demod.output = tagToReaderResponse;
                    Demod.state = DEMOD_UNSYNCD;
                    LED_C_OFF();
                }
@@@ -882,8 -924,6 +884,8 @@@ static int GetIClassCommandFromReader(u
  //-----------------------------------------------------------------------------
  static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
  {
 +      //So far a dummy implementation, not used
 +      //int lastProxToAirDuration =0;
        int i;
  
        ToSendReset();
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
 -      ToSend[++ToSendMax] = 0xff;
 +      ToSend[++ToSendMax] = 0xff;//Proxtoair duration starts here
        ToSend[++ToSendMax] = 0xff;
        ToSend[++ToSendMax] = 0xff;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0xff;
        ToSend[++ToSendMax] = 0xff;
 -      ToSend[++ToSendMax] = 0xff;
 +      ToSend[++ToSendMax] = 0xff;     
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
  
 +      //lastProxToAirDuration  = 8*ToSendMax - 3*8 - 3*8;//Not counting zeroes in the beginning or end
 +
        // Convert from last byte pos to length
        ToSendMax++;
  }
  // Only SOF 
  static void CodeIClassTagSOF()
  {
 -      ToSendReset();
 +      //So far a dummy implementation, not used
 +      //int lastProxToAirDuration =0;
  
 +      ToSendReset();
        // Send SOF
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0xff;
        ToSend[++ToSendMax] = 0x00;
        ToSend[++ToSendMax] = 0xff;
 +
 +//    lastProxToAirDuration  = 8*ToSendMax - 3*8;//Not counting zeroes in the beginning
 +
        
        // Convert from last byte pos to length
        ToSendMax++;
  }
 -
 -//-----------------------------------------------------------------------------
 -// Simulate iClass Card
 -// Only CSN (Card Serial Number)
 -// 
 -//-----------------------------------------------------------------------------
 -void SimulateIClass(uint8_t arg0, uint8_t *datain)
 +int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived, uint8_t *reader_mac_buf);
 +/**
 + * @brief SimulateIClass simulates an iClass card.
 + * @param arg0 type of simulation
 + *                    - 0 uses the first 8 bytes in usb data as CSN
 + *                    - 2 "dismantling iclass"-attack. This mode iterates through all CSN's specified
 + *                    in the usb data. This mode collects MAC from the reader, in order to do an offline
 + *                    attack on the keys. For more info, see "dismantling iclass" and proxclone.com.
 + *                    - Other : Uses the default CSN (031fec8af7ff12e0)
 + * @param arg1 - number of CSN's contained in datain (applicable for mode 2 only)
 + * @param arg2
 + * @param datain
 + */
 +void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
  {
 -      uint8_t simType = arg0;
 -
 +      uint32_t simType = arg0;
 +      uint32_t numberOfCSNS = arg1;
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
  
 -  // Enable and clear the trace
 -      tracing = TRUE;
 -      traceLen = 0;
 -  memset(trace, 0x44, TRACE_SIZE);
 +      // Enable and clear the trace
 +      iso14a_set_tracing(TRUE);
 +      iso14a_clear_trace();
 +
 +      uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
 +      if(simType == 0) {
 +              // Use the CSN from commandline
 +              memcpy(csn_crc, datain, 8);
 +              doIClassSimulation(csn_crc,0,NULL);
 +      }else if(simType == 1)
 +      {
 +              doIClassSimulation(csn_crc,0,NULL);
 +      }
 +      else if(simType == 2)
 +      {
 +
 +              uint8_t mac_responses[64] = { 0 };
 +              Dbprintf("Going into attack mode");
 +              // In this mode, a number of csns are within datain. We'll simulate each one, one at a time
 +              // in order to collect MAC's from the reader. This can later be used in an offlne-attack
 +              // in order to obtain the keys, as in the "dismantling iclass"-paper.
 +              int i = 0;
 +              for( ; i < numberOfCSNS && i*8+8 < USB_CMD_DATA_SIZE; i++)
 +              {
 +                      // The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
 +
 +                      memcpy(csn_crc, datain+(i*8), 8);
 +                      if(doIClassSimulation(csn_crc,1,mac_responses))
 +                      {
 +                              return; // Button pressed
 +                      }
 +              }
 +              cmd_send(CMD_ACK,CMD_SIMULATE_TAG_ICLASS,i,0,mac_responses,i*8);
 +
 +      }
 +      else{
 +              // We may want a mode here where we hardcode the csns to use (from proxclone).
 +              // That will speed things up a little, but not required just yet.
 +              Dbprintf("The mode is not implemented, reserved for future use");
 +      }
 +      Dbprintf("Done...");
 +
 +}
 +/**
 + * @brief Does the actual simulation
 + * @param csn - csn to use
 + * @param breakAfterMacReceived if true, returns after reader MAC has been received.
 + */
 +int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived, uint8_t *reader_mac_buf)
 +{
 +
        // CSN followed by two CRC bytes
        uint8_t response2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 -      uint8_t response3[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
 -
 +      uint8_t response3[] = { 0,0,0,0,0,0,0,0,0,0};
 +      memcpy(response3,csn,sizeof(response3));
 +      Dbprintf("Simulating CSN %02x%02x%02x%02x%02x%02x%02x%02x",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
        // e-Purse
        uint8_t response4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
  
 -      if(simType == 0) {
 -              // Use the CSN from commandline
 -              memcpy(response3, datain, 8);
 -      }
 -
        // Construct anticollision-CSN
        rotateCSN(response3,response2);
  
        ComputeCrc14443(CRC_ICLASS, response2, 8, &response2[8], &response2[9]);
        ComputeCrc14443(CRC_ICLASS, response3, 8, &response3[8], &response3[9]);
  
 +      int exitLoop = 0;
        // Reader 0a
        // Tag    0f
        // Reader 0c
        int resp4Len;
  
        // + 1720..
 -  uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
 +      uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
        memset(receivedCmd, 0x44, RECV_CMD_SIZE);
        int len;
  
  
  
        // Start from off (no field generated)
 -      FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 -      SpinDelay(200);
 -
 -
 +      //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 +      //SpinDelay(200);
 +      FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
 +      SpinDelay(100);
 +      StartCountSspClk();
        // We need to listen to the high-frequency, peak-detected path.
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
        FpgaSetupSsc();
  
        // To control where we are in the protocol
        int cmdsRecvd = 0;
 +      uint32_t time_0 = GetCountSspClk();
 +      uint32_t t2r_time =0;
 +      uint32_t r2t_time =0;
  
        LED_A_ON();
 -      for(;;) {
 +      bool buttonPressed = false;
 +
 +      /** Hack  for testing
 +      memcpy(reader_mac_buf,csn,8);
 +      exitLoop = true;
 +      end hack **/
 +
 +      while(!exitLoop) {
 +
                LED_B_OFF();
                //Signal tracer
                // Can be used to get a trigger for an oscilloscope..
                LED_C_OFF();
  
                if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {
 -                      DbpString("button press");
 +                      buttonPressed = true;
                        break;
                }
 +              r2t_time = GetCountSspClk();
                //Signal tracer
                LED_C_ON();
  
 -
                // Okay, look at the command now.
 -              if(receivedCmd[0] == 0x0a) {
 +              if(receivedCmd[0] == 0x0a ) {
                        // Reader in anticollission phase
                        resp = resp1; respLen = resp1Len; //order = 1;
                        respdata = &sof;
                        respsize = sizeof(sof);
 -                      //resp = resp2; respLen = resp2Len; order = 2;
 -                      //DbpString("Hello request from reader:");
                } else if(receivedCmd[0] == 0x0c) {
                        // Reader asks for anticollission CSN
                        resp = resp2; respLen = resp2Len; //order = 2;
                        LED_B_ON();
                } else if(receivedCmd[0] == 0x05) {
                        // Reader random and reader MAC!!!
 -                      // Lets store this ;-)
 -/*
 -                      Dbprintf("                CSN: %02x %02x %02x %02x %02x %02x %02x %02x",
 -                      response3[0], response3[1], response3[2],
 -                      response3[3], response3[4], response3[5],
 -                      response3[6], response3[7]);
 -*/                    
 -                      Dbprintf("READER AUTH (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
 -                      len,
 -                      receivedCmd[0], receivedCmd[1], receivedCmd[2],
 -                      receivedCmd[3], receivedCmd[4], receivedCmd[5],
 -                      receivedCmd[6], receivedCmd[7], receivedCmd[8]);
 -
                        // Do not respond
                        // We do not know what to answer, so lets keep quit
                        resp = resp1; respLen = 0; //order = 5;
                        respdata = NULL;
                        respsize = 0;
 +                      if (breakAfterMacReceived){
 +                              // TODO, actually return this to the caller instead of just
 +                              // dbprintf:ing ...
 +                              Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
 +                              Dbprintf("RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len,
 +                                               receivedCmd[0], receivedCmd[1], receivedCmd[2],
 +                                              receivedCmd[3], receivedCmd[4], receivedCmd[5],
 +                                              receivedCmd[6], receivedCmd[7], receivedCmd[8]);
 +                              if (reader_mac_buf != NULL)
 +                              {
 +                                      memcpy(reader_mac_buf,receivedCmd+1,8);
 +                              }
 +                              exitLoop = true;
 +                      }
                } else if(receivedCmd[0] == 0x00 && len == 1) {
                        // Reader ends the session
                        resp = resp1; respLen = 0; //order = 0;
                        respdata = NULL;
                        respsize = 0;
                } else {
 +                      //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
                        // Never seen this command before
                        Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
                        len,
                        respsize = 0;
                }
  
 -              if(cmdsRecvd > 999) {
 -                      DbpString("1000 commands later...");
 -                      break;
 +              if(cmdsRecvd >  100) {
 +                      //DbpString("100 commands later...");
 +                      //break;
                }
                else {
                        cmdsRecvd++;
  
                if(respLen > 0) {
                        SendIClassAnswer(resp, respLen, 21);
 +                      t2r_time = GetCountSspClk();
                }
 -              
 +
                if (tracing) {
 -                      LogTrace(receivedCmd,len, rsamples, Uart.parityBits, TRUE);
 +                      LogTrace(receivedCmd,len, (r2t_time-time_0)<< 4, Uart.parityBits,TRUE);
 +                      LogTrace(NULL,0, (r2t_time-time_0) << 4, 0,TRUE);
 +
                        if (respdata != NULL) {
 -                              LogTrace(respdata,respsize, rsamples, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
 +                              LogTrace(respdata,respsize, (t2r_time-time_0) << 4,SwapBits(GetParity(respdata,respsize),respsize),FALSE);
 +                              LogTrace(NULL,0, (t2r_time-time_0) << 4,0,FALSE);
 +
 +
                        }
 -                      if(traceLen > TRACE_SIZE) {
 +                      if(!tracing) {
                                DbpString("Trace full");
 -                              break;
 +                              //break;
                        }
 -              }
  
 +              }
                memset(receivedCmd, 0x44, RECV_CMD_SIZE);
        }
  
 -      Dbprintf("%x", cmdsRecvd);
 +      //Dbprintf("%x", cmdsRecvd);
        LED_A_OFF();
        LED_B_OFF();
 +      if(buttonPressed)
 +      {
 +              DbpString("Button pressed");
 +      }
 +      return buttonPressed;
  }
  
  static int SendIClassAnswer(uint8_t *resp, int respLen, int delay)
@@@ -1469,8 -1430,10 +1473,10 @@@ void ReaderIClass(uint8_t arg0) 
  
        uint8_t* resp = (((uint8_t *)BigBuf) + 3560);   // was 3560 - tied to other size changes
  
+     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Reset trace buffer
 -      memset(trace, 0x44, RECV_CMD_OFFSET);
 +      memset(trace, 0x44, RECV_CMD_OFFSET);
        traceLen = 0;
  
        // Setup SSC
diff --combined armsrc/iso14443a.c
index cd7c9540663bc54a98e48e7551095b8b786677e2,099e1d68ec7766ec96b5a9b345a7e903830cc5a3..d5dd05ca14be2eaed5a0db7df78ace80df5c0df4
@@@ -190,9 -190,8 +190,9 @@@ void AppendCrc14443a(uint8_t* data, in
  }
  
  // The function LogTrace() is also used by the iClass implementation in iClass.c
 -bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t timestamp, uint32_t dwParity, bool bReader)
 +bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t timestamp, uint32_t dwParity, bool readerToTag)
  {
 +      if (!tracing) return FALSE;
        // Return when trace is full
        if (traceLen + sizeof(timestamp) + sizeof(dwParity) + iLen >= TRACE_SIZE) {
                tracing = FALSE;        // don't trace any more
        trace[traceLen++] = ((timestamp >> 8) & 0xff);
        trace[traceLen++] = ((timestamp >> 16) & 0xff);
        trace[traceLen++] = ((timestamp >> 24) & 0xff);
 -      if (!bReader) {
 +
 +      if (!readerToTag) {
                trace[traceLen - 1] |= 0x80;
        }
        trace[traceLen++] = ((dwParity >> 0) & 0xff);
@@@ -1765,6 -1763,7 +1765,7 @@@ int iso14443a_select_card(byte_t* uid_p
  }
  
  void iso14443a_setup(uint8_t fpga_minor_mode) {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Set up the synchronous serial port
        FpgaSetupSsc();
        // connect Demodulated Signal to ADC:
@@@ -1860,10 -1859,8 +1861,10 @@@ void ReaderIso14443a(UsbCommand *c
                if(param & ISO14A_APPEND_CRC) {
                        AppendCrc14443a(cmd,len);
                        len += 2;
 +                      lenbits += 16;
                }
                if(lenbits>0) {
 +
                        ReaderTransmitBitsPar(cmd,lenbits,GetParity(cmd,lenbits/8), NULL);
                } else {
                        ReaderTransmit(cmd,len, NULL);
Impressum, Datenschutz