]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/appmain.c
Added block command for T55xx and support for cloning HID long format
[proxmark3-svn] / armsrc / appmain.c
index ed89fe9896bbacb611b5d80c26c74eb8047470a6..1f005716afa2684e6b60c3727f3d3f4f77cbc5de 100644 (file)
@@ -19,6 +19,7 @@
 #include <stdarg.h>
 
 #include "legicrf.h"
+#include <hitag2.h>
 
 #ifdef WITH_LCD
 # include "fonts.h"
@@ -124,6 +125,33 @@ void Dbprintf(const char *fmt, ...) {
        DbpString(output_string);
 }
 
+// prints HEX & ASCII
+void Dbhexdump(int len, uint8_t *d, bool bAsci) {
+       int l=0,i;
+       char ascii[9];
+    
+       while (len>0) {
+               if (len>8) l=8;
+               else l=len;
+               
+               memcpy(ascii,d,l);
+               ascii[l]=0;
+               
+               // filter safe ascii
+               for (i=0;i<l;i++)
+                       if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
+        
+               if (bAsci) {
+                       Dbprintf("%-8s %*D",ascii,l,d," ");
+               } else {
+                       Dbprintf("%*D",l,d," ");
+               }
+        
+               len-=8;
+               d+=8;           
+       }
+}
+
 //-----------------------------------------------------------------------------
 // Read an ADC channel and block till it completes, then return the result
 // in ADC units (0 to 1023). Also a routine to average 32 samples and
@@ -148,7 +176,7 @@ static int ReadAdc(int ch)
        return d;
 }
 
-static int AvgAdc(int ch)
+int AvgAdc(int ch) // was static - merlok
 {
        int i;
        int a = 0;
@@ -162,14 +190,15 @@ static int AvgAdc(int ch)
 
 void MeasureAntennaTuning(void)
 {
-       uint8_t *dest = (uint8_t *)BigBuf;
-       int i, ptr = 0, adcval = 0, peak = 0, peakv = 0, peakf = 0;;
+       uint8_t *dest = (uint8_t *)BigBuf+FREE_BUFFER_OFFSET;
+       int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 
        int vLf125 = 0, vLf134 = 0, vHf = 0;    // in mV
 
        UsbCommand c;
 
-       DbpString("Measuring antenna characteristics, please wait.");
-       memset(BigBuf,0,sizeof(BigBuf));
+  LED_B_ON();
+       DbpString("Measuring antenna characteristics, please wait...");
+       memset(dest,0,sizeof(FREE_BUFFER_SIZE));
 
 /*
  * Sweeps the useful LF range of the proxmark from
@@ -179,8 +208,10 @@ void MeasureAntennaTuning(void)
  * the resonating frequency of your LF antenna
  * ( hopefully around 95 if it is tuned to 125kHz!)
  */
+  
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
        for (i=255; i>19; i--) {
+    WDT_HIT();
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
                SpinDelay(20);
                // Vref = 3.3V, and a 10000:240 voltage divider on the input
@@ -194,10 +225,11 @@ void MeasureAntennaTuning(void)
                        peakv = adcval;
                        peak = dest[i];
                        peakf = i;
-                       ptr = i;
+                       //ptr = i;
                }
        }
 
+  LED_A_ON();
        // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
        SpinDelay(20);
@@ -209,7 +241,14 @@ void MeasureAntennaTuning(void)
        c.arg[0] = (vLf125 << 0) | (vLf134 << 16);
        c.arg[1] = vHf;
        c.arg[2] = peakf | (peakv << 16);
+
+  DbpString("Measuring complete, sending report back to host");
+
        UsbSendPacket((uint8_t *)&c, sizeof(c));
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+  LED_A_OFF();
+  LED_B_OFF();
+  return;
 }
 
 void MeasureAntennaTuningHf(void)
@@ -235,8 +274,7 @@ void MeasureAntennaTuningHf(void)
 
 void SimulateTagHfListen(void)
 {
-       uint8_t *dest = (uint8_t *)BigBuf;
-       int n = sizeof(BigBuf);
+       uint8_t *dest = (uint8_t *)BigBuf+FREE_BUFFER_OFFSET;
        uint8_t v = 0;
        int i;
        int p = 0;
@@ -270,7 +308,7 @@ void SimulateTagHfListen(void)
                                p = 0;
                                i++;
 
-                               if(i >= n) {
+                               if(i >= FREE_BUFFER_SIZE) {
                                        break;
                                }
                        }
@@ -584,84 +622,201 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        AcquireRawAdcSamples125k(c->arg[0]);
                        UsbSendPacket((uint8_t*)&ack, sizeof(ack));
                        break;
-#endif
-
-#ifdef WITH_LF
                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_HID_DEMOD_FSK:
+                       CmdHIDdemodFSK(0, 0, 0, 1);                                     // Demodulate HID tag
+                       break;
+               case CMD_HID_SIM_TAG:
+                       CmdHIDsimTAG(c->arg[0], c->arg[1], 1);                                  // Simulate HID tag by ID
+                       break;
+               case CMD_HID_CLONE_TAG: // Clone HID tag by ID to T55x7
+                       CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+                       break;
+               case CMD_EM410X_WRITE_TAG:
+                       WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
+                       break;
+               case CMD_READ_TI_TYPE:
+                       ReadTItag();
+                       break;
+               case CMD_WRITE_TI_TYPE:
+                       WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
+                       break;
+               case CMD_SIMULATE_TAG_125K:
+                       LED_A_ON();
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       LED_A_OFF();
+                       break;
+               case CMD_LF_SIMULATE_BIDIR:
+                       SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
+                       break;
+               case CMD_INDALA_CLONE_TAG:                                      // Clone Indala 64-bit tag by UID to T55x7
+                       CopyIndala64toT55x7(c->arg[0], c->arg[1]);                                      
+                       break;
+               case CMD_INDALA_CLONE_TAG_L:                                    // Clone Indala 224-bit tag by UID to T55x7
+                       CopyIndala224toT55x7(c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3], c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]);
+                       break;
+               case CMD_T55XX_READ_BLOCK: 
+                       T55xxReadBlock(c->arg[1], c->arg[2],c->d.asBytes[0]);
+                       break;
+               case CMD_T55XX_WRITE_BLOCK: 
+                       T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]); 
+                       break;
+               case CMD_T55XX_READ_TRACE: // Clone HID tag by ID to T55x7
+                       T55xxReadTrace();
+                       break;
 #endif
 
+#ifdef WITH_HITAG
+               case CMD_SNOOP_HITAG: // Eavesdrop Hitag tag, args = type
+                       SnoopHitag(c->arg[0]);
+                       break;
+               case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
+                       SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
+                       ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+                       break;
+#endif
+            
 #ifdef WITH_ISO15693
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
                        AcquireRawAdcSamplesIso15693();
                        break;
-#endif
-
-               case CMD_BUFF_CLEAR:
-                       BufferClear();
+               case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
+                       RecordRawAdcSamplesIso15693();
+                       break;
+                       
+               case CMD_ISO_15693_COMMAND:
+                       DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+                       break;
+                                       
+               case CMD_ISO_15693_FIND_AFI:
+                       BruteforceIso15693Afi(c->arg[0]);
+                       break;  
+                       
+               case CMD_ISO_15693_DEBUG:
+                       SetDebugIso15693(c->arg[0]);
                        break;
 
-#ifdef WITH_ISO15693
                case CMD_READER_ISO_15693:
                        ReaderIso15693(c->arg[0]);
                        break;
+               case CMD_SIMTAG_ISO_15693:
+                       SimTagIso15693(c->arg[0]);
+                       break;
 #endif
 
-        case CMD_SIMULATE_TAG_LEGIC_RF:
-            LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
-            break;
+#ifdef WITH_LEGICRF
+               case CMD_SIMULATE_TAG_LEGIC_RF:
+                       LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
+                       break;
 
-        case CMD_WRITER_LEGIC_RF:
-            LegicRfWriter(c->arg[1], c->arg[0]);
-            break;
+               case CMD_WRITER_LEGIC_RF:
+                       LegicRfWriter(c->arg[1], c->arg[0]);
+                       break;
 
                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1]);
                        break;
-
-#ifdef WITH_ISO15693
-               case CMD_SIMTAG_ISO_15693:
-                       SimTagIso15693(c->arg[0]);
-                       break;
 #endif
 
 #ifdef WITH_ISO14443b
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
                        AcquireRawAdcSamplesIso14443(c->arg[0]);
                        break;
-#endif
-
-#ifdef WITH_ISO14443b
                case CMD_READ_SRI512_TAG:
                        ReadSRI512Iso14443(c->arg[0]);
                        break;
-               case CMD_READ_SRIX4K_TAG:
-                       ReadSRIX4KIso14443(c->arg[0]);
-                       break;
+               case CMD_READ_SRIX4K_TAG:
+                       ReadSRIX4KIso14443(c->arg[0]);
+                       break;
+               case CMD_SNOOP_ISO_14443:
+                       SnoopIso14443();
+                       break;
+               case CMD_SIMULATE_TAG_ISO_14443:
+                       SimulateIso14443Tag();
+                       break;
 #endif
 
 #ifdef WITH_ISO14443a
+               case CMD_SNOOP_ISO_14443a:
+                       SnoopIso14443a(c->arg[0]);
+                       break;
                case CMD_READER_ISO_14443a:
-                       ReaderIso14443a(c->arg[0]);
+                       ReaderIso14443a(c, &ack);
                        break;
-#endif
-
-#ifdef WITH_ISO14443a
+               case CMD_SIMULATE_TAG_ISO_14443a:
+                       SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2]);  // ## Simulate iso14443a tag - pass tag type & UID
+                       break;
+               case CMD_EPA_PACE_COLLECT_NONCE:
+                       EPA_PACE_Collect_Nonce(c, &ack);
+                       break;
+                       
                case CMD_READER_MIFARE:
                        ReaderMifare(c->arg[0]);
                        break;
-#endif
-
-#ifdef WITH_ISO14443b
-               case CMD_SNOOP_ISO_14443:
-                       SnoopIso14443();
+               case CMD_MIFARE_READBL:
+                       MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_READSC:
+                       MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_WRITEBL:
+                       MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_NESTED:
+                       MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_CHKKEYS:
+                       MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_SIMULATE_MIFARE_CARD:
+                       Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               
+               // emulator
+               case CMD_MIFARE_SET_DBGMODE:
+                       MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMCLR:
+                       MifareEMemClr(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMSET:
+                       MifareEMemSet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_MEMGET:
+                       MifareEMemGet(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_CARDLOAD:
+                       MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+                       
+               // Work with "magic Chinese" card
+               case CMD_MIFARE_EML_CSETBLOCK:
+                       MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_EML_CGETBLOCK:
+                       MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+                       
+               // mifare sniffer
+               case CMD_MIFARE_SNIFFER:
+                       SniffMifare(c->arg[0]);
                        break;
 #endif
 
-#ifdef WITH_ISO14443a
-               case CMD_SNOOP_ISO_14443a:
-                       SnoopIso14443a();
+#ifdef WITH_ICLASS
+               // Makes use of ISO14443a FPGA Firmware
+               case CMD_SNOOP_ICLASS:
+                       SnoopIClass();
+                       break;
+               case CMD_SIMULATE_TAG_ICLASS:
+                       SimulateIClass(c->arg[0], c->d.asBytes);
+                       break;
+               case CMD_READER_ICLASS:
+                       ReaderIClass(c->arg[0]);
                        break;
 #endif
 
@@ -669,17 +824,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        SimulateTagHfListen();
                        break;
 
-#ifdef WITH_ISO14443b
-               case CMD_SIMULATE_TAG_ISO_14443:
-                       SimulateIso14443Tag();
+               case CMD_BUFF_CLEAR:
+                       BufferClear();
                        break;
-#endif
-
-#ifdef WITH_ISO14443a
-               case CMD_SIMULATE_TAG_ISO_14443a:
-                       SimulateIso14443aTag(c->arg[0], c->arg[1]);  // ## Simulate iso14443a tag - pass tag type & UID
-                       break;
-#endif
 
                case CMD_MEASURE_ANTENNA_TUNING:
                        MeasureAntennaTuning();
@@ -693,36 +840,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        ListenReaderField(c->arg[0]);
                        break;
 
-#ifdef WITH_LF
-               case CMD_HID_DEMOD_FSK:
-                       CmdHIDdemodFSK(0, 0, 0, 1);                             // Demodulate HID tag
-                       break;
-#endif
-
-#ifdef WITH_LF
-               case CMD_HID_SIM_TAG:
-                       CmdHIDsimTAG(c->arg[0], c->arg[1], 1);                                  // Simulate HID tag by ID
-                       break;
-#endif
-
                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control
                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                        SpinDelay(200);
                        LED_D_OFF(); // LED D indicates field ON or OFF
                        break;
 
-#ifdef WITH_LF
-               case CMD_READ_TI_TYPE:
-                       ReadTItag();
-                       break;
-#endif
-
-#ifdef WITH_LF
-               case CMD_WRITE_TI_TYPE:
-                       WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
-                       break;
-#endif
-
                case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
                        UsbCommand n;
                        if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) {
@@ -732,25 +855,17 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        }
                        n.arg[0] = c->arg[0];
                        memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(uint32_t));
+                       LED_B_ON();
                        UsbSendPacket((uint8_t *)&n, sizeof(n));
-                       break;
-               }
+                       LED_B_OFF();
+               } break;
 
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        uint8_t *b = (uint8_t *)BigBuf;
                        memcpy(b+c->arg[0], c->d.asBytes, 48);
                        //Dbprintf("copied 48 bytes to %i",b+c->arg[0]);
                        UsbSendPacket((uint8_t*)&ack, sizeof(ack));
-                       break;
-               }
-
-#ifdef WITH_LF
-               case CMD_SIMULATE_TAG_125K:
-                       LED_A_ON();
-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
-                       LED_A_OFF();
-                       break;
-#endif
+               } break;
 
                case CMD_READ_MEM:
                        ReadMem(c->arg[0]);
@@ -773,12 +888,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        SendVersion();
                        break;
 
-#ifdef WITH_LF
-               case CMD_LF_SIMULATE_BIDIR:
-                       SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
-                       break;
-#endif
-
 #ifdef WITH_LCD
                case CMD_LCD_RESET:
                        LCDReset();
@@ -789,7 +898,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 #endif
                case CMD_SETUP_WRITE:
                case CMD_FINISH_WRITE:
-               case CMD_HARDWARE_RESET:
+               case CMD_HARDWARE_RESET: {
                        USB_D_PLUS_PULLUP_OFF();
                        SpinDelay(1000);
                        SpinDelay(1000);
@@ -797,16 +906,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        for(;;) {
                                // We're going to reset, and the bootrom will take control.
                        }
-                       break;
+        } break;
 
-               case CMD_START_FLASH:
+               case CMD_START_FLASH: {
                        if(common_area.flags.bootrom_present) {
                                common_area.command = COMMON_AREA_COMMAND_ENTER_FLASH_MODE;
                        }
                        USB_D_PLUS_PULLUP_OFF();
                        AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
                        for(;;);
-                       break;
+        } break;
 
                case CMD_DEVICE_INFO: {
                        UsbCommand c;
@@ -814,11 +923,11 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        c.arg[0] = DEVICE_INFO_FLAG_OSIMAGE_PRESENT | DEVICE_INFO_FLAG_CURRENT_MODE_OS;
                        if(common_area.flags.bootrom_present) c.arg[0] |= DEVICE_INFO_FLAG_BOOTROM_PRESENT;
                        UsbSendPacket((uint8_t*)&c, sizeof(c));
-               }
-                       break;
-               default:
+               } break;
+            
+               default: {
                        Dbprintf("%s: 0x%04x","unknown command:",c->cmd);
-                       break;
+        } break;
        }
 }
 
@@ -858,6 +967,8 @@ void  __attribute__((noreturn)) AppMain(void)
        // Load the FPGA image, which we have stored in our flash.
        FpgaDownloadAndGo();
 
+       StartTickCount();
+       
 #ifdef WITH_LCD
 
        LCDInit();
Impressum, Datenschutz