]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
ADD: "hf legic eload" - Load binary file to emulator memory. Use "h" for help text
authoriceman1001 <iceman@iuse.se>
Thu, 6 Oct 2016 17:13:23 +0000 (19:13 +0200)
committericeman1001 <iceman@iuse.se>
Thu, 6 Oct 2016 17:13:23 +0000 (19:13 +0200)
ADD:  "hf legic esave" - Save emulator memory to binary file. Use "h" for help text

armsrc/appmain.c
armsrc/legicrf.c
armsrc/legicrf.h
client/cmdhflegic.c
client/cmdhflegic.h
client/hid-flasher/usb_cmd.h
client/lualibs/commands.lua
include/usb_cmd.h

index 549feff0bb25e82ee230d0163b65d9bba29bb97b..4d6a5fdfbd73313b08af7d6659c2bf7185116a41 100644 (file)
@@ -1052,22 +1052,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                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[0], c->arg[1], c->arg[2]);
-                       break;
-
-               case CMD_RAW_WRITER_LEGIC_RF:
-                       LegicRfRawWriter(c->arg[0], c->arg[1], c->arg[2]);
+                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-
                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
-                       break;
-                       
+                       break;                  
                case CMD_LEGIC_INFO:
                        LegicRfInfo();
                        break;
+               case CMD_LEGIC_ESET:
+                       LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes);
+                       break;
 #endif
 
 #ifdef WITH_ISO14443b
@@ -1196,7 +1192,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_MIFARE_DESFIRE:
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
-
                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif
@@ -1227,7 +1222,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_ICLASS_REPLAY:
                    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
                        break;
-       case CMD_ICLASS_EML_MEMSET:
+               case CMD_ICLASS_EML_MEMSET:
                        emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_WRITEBLOCK:
index 766bd443ce139e7cc2bc4cf1957c3ee2ee17365f..19f12a95bc5817e6ce227c8fc682e8ffa1796fd6 100644 (file)
@@ -407,19 +407,15 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
  * - wait until the tag sends back an ACK ('1' bit unencrypted)
  * - forward the prng based on the timing
  */
-//int legic_write_byte(int byte, int addr, int addr_sz, int PrngCorrection) {
-int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
-
-    //do not write UID, CRC at offset 0-4.
-       if (addr <= 4) return 0;
+int legic_write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz) {
 
        // crc
        crc_clear(&legic_crc);
        crc_update(&legic_crc, 0, 1); /* CMD_WRITE */
-       crc_update(&legic_crc, addr, addr_sz);
+       crc_update(&legic_crc, index, addr_sz);
        crc_update(&legic_crc, byte, 8);
        uint32_t crc = crc_finish(&legic_crc);
-       uint32_t crc2 = legic4Crc(LEGIC_WRITE, addr, byte, addr_sz+1);
+       uint32_t crc2 = legic4Crc(LEGIC_WRITE, index, byte, addr_sz+1);
        if ( crc != crc2 ) {
                Dbprintf("crc is missmatch");
                return 1;
@@ -427,8 +423,8 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
        // send write command
        uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
-                   |(addr    <<1)             //Address
-                   | LEGIC_WRITE);             //CMD = Write
+                   |(index    <<1)             //index
+                   | LEGIC_WRITE);            //CMD = Write
                                   
     uint32_t cmd_sz = addr_sz+1+8+4;          //crc+data+cmd
 
@@ -437,15 +433,16 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
        WaitTicks(330);
        
        frame_sendAsReader(cmd, cmd_sz);
-   
+
+       // wait for ack
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
 
-       // wait for ack
     int t, old_level = 0, edges = 0;
     int next_bit_at = 0;
 
-       WaitTicks(TAG_FRAME_WAIT);
+       // ACK 3.6ms = 3600us * 1.5 = 5400ticks.
+       WaitTicks(5360);
 
     for( t = 0; t < 80; ++t) {
         edges = 0;
@@ -457,7 +454,8 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 
             old_level = level;
         }
-        if(edges > 20 ) { /* expected are 42 edges */
+               /* expected are 42 edges (ONE) */
+        if(edges > 20 ) {
                        int t = timer->TC_CV;
                        int c = t / TAG_BIT_PERIOD;
                        
@@ -467,7 +465,6 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
         }
     }
 
-       ResetTimer(timer);
        return -1;
 }
 
@@ -512,51 +509,16 @@ OUT:
     return 0;
 }
 
-/*int _LegicRfWriter(int offset, int bytes, int addr_sz, uint8_t *BigBuf, int RoundBruteforceValue) {
-       int byte_index=0;
-
-    LED_B_ON();
-       setup_phase_reader(iv);
-    //legic_prng_forward(2);
-       while(byte_index < bytes) {
-               int r;
-
-               //check if the DCF should be changed
-               if ( (offset == 0x05) && (bytes == 0x02) ) {
-                       //write DCF in reverse order (addr 0x06 before 0x05)
-                       r = legic_write_byte(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz, RoundBruteforceValue);
-                       //legic_prng_forward(1);
-                       if(r == 0) {
-                               byte_index++;
-                               r = legic_write_byte(BigBuf[(0x06-byte_index)], (0x06-byte_index), addr_sz, RoundBruteforceValue);
-                       }
-                       //legic_prng_forward(1);
-               }
-               else {
-                       r = legic_write_byte(BigBuf[byte_index+offset], byte_index+offset, addr_sz, RoundBruteforceValue);
-               }
-               if((r != 0) || BUTTON_PRESS()) {
-                       Dbprintf("operation aborted @ 0x%03.3x", byte_index);
-       switch_off_tag_rwd();
-                       LED_B_OFF();
-                       LED_C_OFF();
-                       return -1;
-               }
-
-        WDT_HIT();
-               byte_index++;
-        if(byte_index & 0x10) LED_C_ON(); else LED_C_OFF();
-       }
-    LED_B_OFF();
-    LED_C_OFF();
-    DbpString("write successful");
-    return 0;
-}*/
-
-void LegicRfWriter(uint16_t offset, uint16_t bytes, uint8_t iv) {
+void LegicRfWriter(uint16_t offset, uint16_t len, uint8_t iv, uint8_t *data) {
 
-       int byte_index = 0;  
        uint8_t isOK = 1;
+       
+       // UID not is writeable.
+       if ( offset <= 4 ) {
+               isOK = 0;
+               goto OUT;
+       }
+       
        legic_card_select_t card;
        
        LegicCommonInit();
@@ -566,63 +528,40 @@ void LegicRfWriter(uint16_t offset, uint16_t bytes, uint8_t iv) {
                goto OUT;
        }
        
-       switch_off_tag_rwd();
-       
-       switch(card.tagtype) {
-               case 0x0d:
-                       if(offset+bytes > 22) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", offset + bytes);
-                               return;
-                       }
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset + bytes);
-                       break;
-               case 0x1d:
-                       if(offset+bytes > 0x100) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", offset + bytes);
-                               return;
-                       }
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing 0x%02.2x - 0x%02.2x ...", offset, offset + bytes);
-                       break;
-               case 0x3d:
-                       if(offset+bytes > 0x400) {
-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", offset + bytes);
-                       return;
-               }
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM1024 card found, writing 0x%03.3x - 0x%03.3x ...", offset, offset + bytes);
-                       break;
-               default:
-            return;
-       }
+       if (len + offset >= card.cardsize)
+               len = card.cardsize - offset;
 
-    LED_B_ON();
        setup_phase_reader(iv);
-       
-       int r = 0;
-       while(byte_index < bytes) {
 
-               //check if the DCF should be changed
-               if ( ((byte_index+offset) == 0x05) && (bytes >= 0x02) ) {
-                       //write DCF in reverse order (addr 0x06 before 0x05)
-                       r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), card.addrsize);
-
-                       // write second byte on success
-                       if(r == 0) {
-                               byte_index++;
-                               r = legic_write_byte(cardmem[(0x06-byte_index)], (0x06-byte_index), card.addrsize);
-                       }
-               }
-               else {
-                       r = legic_write_byte(cardmem[byte_index+offset], byte_index+offset, card.addrsize);
-               }
+    LED_B_ON();        
+       int r = 0;
+       // how about we write backwards instead. no need for this extra DCF check.      
+       // index = len - cardsize
+       // stops uid 01234, 
+       /*
+       len = 20
+       offset = 5
+       
+       index = 20+5 = 25
+       if ( index > cardsize ) return -1;
+       
+       loop
+               write( cardmem[index], index , card.addrsize);
+               --index;
+       end loop        
+       */
+       uint16_t index = len;
+       while(index > 4) {
+
+               r = legic_write_byte( index, cardmem[ index ], card.addrsize);
                
-               if ((r != 0) || BUTTON_PRESS()) {
-                       Dbprintf("operation aborted @ 0x%03.3x", byte_index);
+               if ( r ) {
+                       Dbprintf("operation aborted @ 0x%03.3x", index);
                        isOK = 0;
                        goto OUT;
                }
-
-        WDT_HIT();
-               byte_index++;
+               --index;
+               WDT_HIT();
        }
 
 OUT:
@@ -631,66 +570,6 @@ OUT:
        LEDsoff();      
 }
 
-void LegicRfRawWriter(int address, int byte, uint8_t iv) {
-
-       int byte_index = 0, addr_sz = 0;
-       
-       LegicCommonInit();
-       
-       if ( MF_DBGLEVEL >= 2) DbpString("setting up legic card");
-       
-       uint32_t tag_type = setup_phase_reader(iv);
-       
-       switch_off_tag_rwd();
-       
-       switch(tag_type) {
-               case 0x0d:
-                       if(address > 22) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM22", address);
-                               return;
-                       }
-                       addr_sz = 5;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM22 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);
-                       break;
-               case 0x1d:
-                       if(address > 0x100) {
-                               Dbprintf("Error: can not write to 0x%03.3x on MIM256", address);
-                               return;
-                       }
-                       addr_sz = 8;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM256 card found, writing at addr 0x%02.2x - value 0x%02.2x ...", address, byte);
-                       break;
-               case 0x3d:
-                       if(address > 0x400) {
-                       Dbprintf("Error: can not write to 0x%03.3x on MIM1024", address);
-                       return;
-               }
-                       addr_sz = 10;
-                       if ( MF_DBGLEVEL >= 2) Dbprintf("MIM1024 card found, writing at addr 0x%03.3x - value 0x%03.3x ...", address, byte);
-                       break;
-               default:
-                       Dbprintf("No or unknown card found, aborting");
-            return;
-       }
-       
-       Dbprintf("integer value: %d address: %d  addr_sz: %d", byte, address, addr_sz);
-    LED_B_ON();
-       
-       setup_phase_reader(iv);
-               
-       int r = legic_write_byte(byte, address, addr_sz);
-               
-       if((r != 0) || BUTTON_PRESS()) {
-               Dbprintf("operation aborted @ 0x%03.3x (%1d)", byte_index, r);
-               switch_off_tag_rwd();
-               LEDsoff();
-               return;
-       }
-
-    LEDsoff();
-    if ( MF_DBGLEVEL >= 1) DbpString("write successful");
-}
-
 int legic_select_card_iv(legic_card_select_t *p_card, uint8_t iv){
 
        if ( p_card == NULL ) return 1;
@@ -725,8 +604,42 @@ int legic_select_card(legic_card_select_t *p_card){
        return legic_select_card_iv(p_card, 0x01);
 }
 
+//-----------------------------------------------------------------------------
+// Work with emulator memory
+// 
+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
+// involved in dealing with emulator memory. But if it is called later, it might
+// destroy the Emulator Memory.
+//-----------------------------------------------------------------------------
+// arg0 = offset
+// arg1 = num of bytes
+void LegicEMemSet(uint32_t arg0, uint32_t arg1, uint8_t *data) {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       legic_emlset_mem(data, arg0, arg1);
+}
+// arg0 = offset
+// arg1 = num of bytes
+void LegicEMemGet(uint32_t arg0, uint32_t arg1) {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
+       legic_emlget_mem(buf, arg0, arg1);
+       LED_B_ON();
+       cmd_send(CMD_ACK, arg0, arg1, 0, buf, USB_CMD_DATA_SIZE);
+       LED_B_OFF();
+}
+void legic_emlset_mem(uint8_t *data, int offset, int numofbytes) {
+       cardmem = BigBuf_get_EM_addr();
+       memcpy(cardmem + offset, data, numofbytes);
+}
+void legic_emlget_mem(uint8_t *data, int offset, int numofbytes) {
+       cardmem = BigBuf_get_EM_addr();
+       memcpy(data, cardmem + offset, numofbytes);
+}
+
 void LegicRfInfo(void){
 
+       int r;
+       
        uint8_t buf[sizeof(legic_card_select_t)] = {0x00};
        legic_card_select_t *card = (legic_card_select_t*) buf;
        
@@ -739,7 +652,7 @@ void LegicRfInfo(void){
 
        // read UID bytes
        for ( uint8_t i = 0; i < sizeof(card->uid); ++i) {
-               int r = legic_read_byte(i, card->cmdsize);
+               r = legic_read_byte(i, card->cmdsize);
                if ( r == -1 ) {
                        cmd_send(CMD_ACK,0,0,0,0,0);
                        goto OUT;
@@ -747,6 +660,15 @@ void LegicRfInfo(void){
                card->uid[i] = r & 0xFF;
        }
 
+       // MCC byte.
+       r = legic_read_byte(4, card->cmdsize);
+       uint32_t calc_mcc =  CRC8Legic(card->uid, 4);;
+       if ( r != calc_mcc) {
+               cmd_send(CMD_ACK,0,0,0,0,0);
+               goto OUT;
+       }
+       
+       // OK
        cmd_send(CMD_ACK, 1, 0, 0, buf, sizeof(legic_card_select_t));
 
 OUT:
index c4b3e582e55e66270fe799d79f73dc3eaf233f8d..8a51ebcd282d2883486697f081814992136d33ad 100644 (file)
@@ -22,8 +22,7 @@
 
 extern void LegicRfSimulate(int phase, int frame, int reqresp);
 extern int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv);
-extern void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv);
-extern void LegicRfRawWriter(int address, int data, uint8_t iv);
+extern void LegicRfWriter(uint16_t offset, uint16_t byte, uint8_t iv, uint8_t *data);
 extern void LegicRfInfo(void);
 
 uint32_t get_key_stream(int skip, int count);
@@ -31,9 +30,17 @@ void frame_send_tag(uint16_t response, uint8_t bits);
 void frame_sendAsReader(uint32_t data, uint8_t bits);
 
 int legic_read_byte( uint16_t index, uint8_t cmd_sz);
+int legic_write_byte(uint16_t index, uint8_t byte, uint8_t addr_sz);
 
 int legic_select_card(legic_card_select_t *p_card);
 int legic_select_card_iv(legic_card_select_t *p_card, uint8_t iv);
+
+// emulator mem
+void LegicEMemSet(uint32_t arg0, uint32_t arg1, uint8_t *data);
+void LegicEMemGet(uint32_t arg0, uint32_t arg1);
+void legic_emlset_mem(uint8_t *data, int offset, int numofbytes);
+void legic_emlget_mem(uint8_t *data, int offset, int numofbytes);
+
 void ice_legic_setup();
 
 #endif /* __LEGICRF_H */
index b9a51b637cc608b4360bc2f7169a5c656b3b2e58..d544a91cca73d5ca9060075b7705b952fb0cf358 100644 (file)
@@ -84,10 +84,6 @@ int usage_legic_rawwrite(void){
        PrintAndLog("      hf legic writeraw 10 4    - writes 0x4 to byte[0x10]");
        return 0;
 }
-int usage_legic_fill(void){
-       PrintAndLog("Missing help text.");
-       return 0;
-}
 int usage_legic_reader(void){
        PrintAndLog("Read UID and type information from a legic tag.");
        PrintAndLog("Usage:  hf legic reader [h]");
@@ -124,6 +120,39 @@ int usage_legic_dump(void){
        return 0;
 }
 
+int usage_legic_eload(void){
+       PrintAndLog("It loads binary dump from the file `filename.bin`");
+       PrintAndLog("Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
+       PrintAndLog("Options:");
+       PrintAndLog("  h             : this help");
+       PrintAndLog("  [card memory] : 0 = MIM22");
+       PrintAndLog("                : 1 = MIM256 (default)");
+       PrintAndLog("                : 2 = MIM1024");
+       PrintAndLog("  <filename>    : filename w/o .bin to load");     
+       PrintAndLog("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic eload filename");
+       PrintAndLog("      hf legic eload 2 filename");
+       return 0;
+}
+int usage_legic_esave(void){
+       PrintAndLog("It saves binary dump into the file `filename.bin` or `cardID.bin`");
+       PrintAndLog(" Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
+       PrintAndLog("Options:");
+       PrintAndLog("  h             : this help");
+       PrintAndLog("  [card memory] : 0 = MIM22");
+       PrintAndLog("                : 1 = MIM256 (default)");
+       PrintAndLog("                : 2 = MIM1024");
+       PrintAndLog("  <filename>    : filename w/o .bin to load");     
+       PrintAndLog("");
+       PrintAndLog("Samples:");        
+       PrintAndLog("      hf legic esave ");
+       PrintAndLog("      hf legic esave 2");
+       PrintAndLog("      hf legic esave 2 filename");
+       return 0;
+}
+
+
 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held
@@ -166,6 +195,7 @@ int CmdLegicInfo(const char *Cmd) {
                (calc_crc == crc) ? "OK":"Fail"
        );
  
+       // MCD = Manufacturer ID (should be list meaning something?)
 
        token_type[0] = 0;
        dcf = ((int)data[6] << 8) | (int)data[5];
@@ -434,15 +464,7 @@ int CmdLegicRdmem(const char *Cmd) {
                PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len);
        }
        
-       if ( (IV & 0x7F) != IV ){
-               IV &= 0x7F;
-               PrintAndLog("Truncating IV to 7bits");
-       }
-       
-       if ( (IV & 1) == 0 ){
-               IV |= 0x01;
-               PrintAndLog("LSB of IV must be SET");   
-       }
+       legic_chk_iv(&IV);
        
        UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
        clearCommandBuffer();
@@ -484,6 +506,8 @@ int CmdLegicRdmem(const char *Cmd) {
        return 0;
 }
 
+// load, filename  (ascii hex textfile)
+// uploads it to device mem
 int CmdLegicLoad(const char *Cmd) {
 
 // iceman: potential bug, where all filepaths or filename which starts with H or h will print the helptext :)  
@@ -563,6 +587,9 @@ int CmdLegicLoad(const char *Cmd) {
     return 0;
 }
 
+// Save,  filename, num of bytes, starting offset. (in decimal)
+//  ie:  "hf legic save nnn.txt 100 0  (saves the first 100bytes)
+// (ascii hex textfile)
 int CmdLegicSave(const char *Cmd) {
        int requested = 1024;
        int offset = 0;
@@ -616,6 +643,8 @@ int CmdLegicSave(const char *Cmd) {
 }
 
 //TODO: write a help text (iceman)
+// should say which tagtype
+// should load a tag to device mem.
 int CmdLegicRfSim(const char *Cmd) {
        UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}};
        sscanf(Cmd, " %"lli" %"lli" %"lli, &c.arg[0], &c.arg[1], &c.arg[2]);
@@ -626,11 +655,9 @@ int CmdLegicRfSim(const char *Cmd) {
 
 int CmdLegicRfWrite(const char *Cmd) {
 
-       // params:
        // offset - in tag memory
        // length - num of bytes to be written
-       // IV - initialisation vector
-       
+
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_write();
        
@@ -641,31 +668,32 @@ int CmdLegicRfWrite(const char *Cmd) {
                PrintAndLog("Please specify the offset and length as two hex strings and, optionally, the IV also as an hex string");
         return -1;
     }
+       
+       // tagtype
+       legic_card_select_t card;
+       if (legic_get_type(&card)) {
+               PrintAndLog("Failed to identify tagtype");
+               return -1;
+       }
 
+       legic_print_type(card.cardsize, 0);
+       
        // OUT-OF-BOUNDS check
-       if ( len + offset > MAX_LENGTH ) {
-               len = MAX_LENGTH - offset;
-               PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len);
-       }
-       if ( (IV & 0x7F) != IV ){
-               IV &= 0x7F;
-               PrintAndLog("Truncating IV to 7bits");
-       }
-       if ( (IV & 1) == 0 ){
-               IV |= 0x01;  // IV must be odd
-               PrintAndLog("LSB of IV must be SET");   
+       if ( len + offset > card.cardsize ) {
+               PrintAndLog("Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
+               return -2;
        }
        
+       legic_chk_iv(&IV);
+       
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};   
        clearCommandBuffer();
     SendCommand(&c);
        UsbCommand resp;
        if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
                uint8_t isOK = resp.arg[0] & 0xFF;
-                if ( isOK ) {
-                } else {
-                        PrintAndLog("failed writig tag");
-                }
+                if ( !isOK )
+                        PrintAndLog("failed writing tag");
        } else {
                PrintAndLog("command execution time out");
                return 1;
@@ -720,31 +748,6 @@ int CmdLegicRfRawWrite(const char *Cmd) {
        return 0;
 }
 
-//TODO: write a help text (iceman)
-int CmdLegicRfFill(const char *Cmd) {
-    UsbCommand cmd = {CMD_WRITER_LEGIC_RF, {0,0,0} };
-    int res = sscanf(Cmd, " 0x%"llx" 0x%"llx" 0x%"llx, &cmd.arg[0], &cmd.arg[1], &cmd.arg[2]);
-    if(res != 3) {
-        PrintAndLog("Please specify the offset, length and value as two hex strings");
-        return -1;
-    }
-
-    int i;
-    UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {0, 0, 0}};
-       memset(c.d.asBytes, cmd.arg[2], 48);
-
-       for(i = 0; i < 22; i++) {
-               c.arg[0] = i*48;
-               
-               clearCommandBuffer();
-               SendCommand(&c);
-               WaitForResponse(CMD_ACK, NULL);
-       }
-       clearCommandBuffer();
-    SendCommand(&cmd);
-    return 0;
- }
-
 void static calc4(uint8_t *cmd, uint8_t len){
        crc_t crc;
        //crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, TRUE, TRUE);
@@ -898,6 +901,34 @@ int legic_get_type(legic_card_select_t *card){
        memcpy(card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
        return 0;
 }
+void legic_chk_iv(uint32_t *iv){
+       if ( (*iv & 0x7F) != *iv ){
+               *iv &= 0x7F;
+               PrintAndLog("Truncating IV to 7bits, %u", *iv);
+       }
+       // IV must be odd
+       if ( (*iv & 1) == 0 ){
+               *iv |= 0x01;  
+               PrintAndLog("LSB of IV must be SET %u", *iv);   
+       }
+}
+
+void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
+
+       size_t len = 0;
+       UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};     
+
+       for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
+               
+               len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);         
+               c.arg[0] = i; // offset
+               c.arg[1] = len; // number of bytes
+               memcpy(c.d.asBytes, src, len); 
+               clearCommandBuffer();
+               SendCommand(&c);
+               PrintAndLog("ICE: offset %d | len %d", i, len);
+       }
+}
 
 int HFLegicReader(const char *Cmd, bool verbose) {
 
@@ -925,7 +956,7 @@ int CmdLegicReader(const char *Cmd){
 
 int CmdLegicDump(const char *Cmd){
 
-       FILE *fout;
+       FILE *f;
        char filename[FILE_PATH_SIZE] = {0x00};
        char *fnameptr = filename;
        size_t fileNlen = 0;
@@ -933,24 +964,26 @@ int CmdLegicDump(const char *Cmd){
        uint16_t dumplen;       
        uint8_t cmdp = 0;
        
-       while(param_getchar(Cmd, cmdp) != 0x00)
-       {
-               switch(param_getchar(Cmd, cmdp))
-               {
-               case 'h':
-               case 'H':
-                       return usage_legic_dump();
-               case 'o':
-               case 'O':
-                       fileNlen = param_getstr(Cmd, cmdp+1, filename);
-                       if (!fileNlen) errors = true; 
-                       if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
-                       cmdp += 2;
-                       break;
-               default:
-                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                       errors = true;
-                       break;
+       memset(filename, 0, sizeof(filename));
+       
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+                       case 'h':
+                       case 'H':
+                               return usage_legic_dump();
+                       case 'o':
+                       case 'O':
+                               fileNlen = param_getstr(Cmd, cmdp+1, filename);
+                               if (!fileNlen) 
+                                       errors = true; 
+                               if (fileNlen > FILE_PATH_SIZE-5) 
+                                       fileNlen = FILE_PATH_SIZE-5;
+                               cmdp += 2;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = true;
+                               break;
                }
                if(errors) break;
        }
@@ -986,7 +1019,7 @@ int CmdLegicDump(const char *Cmd){
 
        uint16_t readlen = resp.arg[1];
        uint8_t *data = malloc(readlen);
-       if ( !data ){
+       if (!data) {
                PrintAndLog("Fail, cannot allocate memory");
                return 3;
        }
@@ -998,7 +1031,7 @@ int CmdLegicDump(const char *Cmd){
        GetEMLFromBigBuf(data, readlen, 0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
                PrintAndLog("Fail, transfer from device time-out");
-               if ( data ) free(data);
+               free(data);
                return 4;
        }
 
@@ -1008,18 +1041,140 @@ int CmdLegicDump(const char *Cmd){
        else
                sprintf(fnameptr + fileNlen,".bin");
 
-       if ((fout = fopen(filename,"wb")) == NULL) { 
+       if ((f = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
-               if ( data ) free(data);
+               if (data)
+                       free(data);
                return 5;
        }
-       fwrite( data, 1, readlen, fout );
-       fclose(fout);
-       if ( data ) free(data);
-       
+       fwrite(data, 1, readlen, f);
+       fclose(f);
+       free(data);
        PrintAndLog("Wrote %d bytes to %s", readlen, filename);
        return 0;
 }      
+
+int CmdLegicELoad(const char *Cmd) {
+       FILE * f;
+       char filename[FILE_PATH_SIZE];
+       char *fnameptr = filename;
+       int len, numofbytes;
+       int nameParamNo = 1;
+       
+       char cmdp = param_getchar(Cmd, 0);              
+       if ( cmdp == 'h' || cmdp == 'H' || cmdp == 0x00)
+               return usage_legic_eload();
+
+       switch (cmdp) {
+               case '0' : numofbytes = 22; break;
+               case '1' : 
+               case '\0': numofbytes = 256; break;
+               case '2' : numofbytes = 1024; break;
+               default  : numofbytes = 256;  nameParamNo = 0;break;
+       }
+
+       // set up buffer
+       uint8_t *data = malloc(numofbytes);
+       if (!data) {
+               PrintAndLog("Fail, cannot allocate memory");
+               return 3;               
+       }
+       memset(data, 0, numofbytes);
+       
+       // set up file
+       len = param_getstr(Cmd, nameParamNo, filename);
+       if (len > FILE_PATH_SIZE - 5) 
+               len = FILE_PATH_SIZE - 5;
+       fnameptr += len;
+       sprintf(fnameptr, ".bin");      
+       
+       // open file
+       if ((f = fopen(filename,"rb")) == NULL) { 
+               PrintAndLog("File %s not found or locked", filename);
+               free(data);
+               return 1;
+       }
+
+       // load file
+       size_t bytes_read = fread(data, 1, numofbytes, f);
+       if ( bytes_read == 0){
+               PrintAndLog("File reading error");
+               free(data);
+               fclose(f);
+               return 2;
+       }
+       fclose(f);
+       
+       // transfer to device
+       legic_seteml(data, 0, numofbytes);
+               
+       free(data);     
+       PrintAndLog("\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
+       return 0;
+}
+
+int CmdLegicESave(const char *Cmd) {
+       FILE *f;
+       char filename[FILE_PATH_SIZE];
+       char *fnameptr = filename;
+       int fileNlen, numofbytes, nameParamNo = 1;
+       
+       memset(filename, 0, sizeof(filename));
+
+       char cmdp = param_getchar(Cmd, 0);
+       
+       if ( cmdp == 'h' || cmdp == 'H' || cmdp == 0x00)
+               return usage_legic_esave();
+
+       switch (cmdp) {
+               case '0' : numofbytes = 22; break;
+               case '1' : 
+               case '\0': numofbytes = 256; break;
+               case '2' : numofbytes = 1024; break;
+               default  : numofbytes = 256; nameParamNo = 0; break;
+       }
+
+       fileNlen = param_getstr(Cmd, nameParamNo, filename);
+       
+       if (fileNlen > FILE_PATH_SIZE - 5) 
+               fileNlen = FILE_PATH_SIZE - 5;
+
+       // set up buffer
+       uint8_t *data = malloc(numofbytes);
+       if (!data) {
+               PrintAndLog("Fail, cannot allocate memory");
+               return 3;               
+       }
+       memset(data, 0, numofbytes);
+               
+       // download emulator memory
+       PrintAndLog("Reading emulator memory...");
+       
+       GetEMLFromBigBuf(data, numofbytes, 0);
+       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
+               PrintAndLog("Fail, transfer from device time-out");
+               free(data);
+               return 4;
+       }
+
+       // user supplied filename?
+       if (fileNlen < 1)               
+               sprintf(fnameptr,"%02X%02X%02X%02X.bin", data[0], data[1], data[2], data[3]);
+       else
+               sprintf(fnameptr + fileNlen,".bin");
+       
+       // open file
+       if ((f = fopen(filename,"wb")) == NULL) { 
+               PrintAndLog("Could not create file name %s", filename);
+               free(data);
+               return 1;
+       }
+       fwrite(data, 1, numofbytes, f);
+       fclose(f);
+       free(data);
+       PrintAndLog("\nSaved %d bytes from emulator memory to file: %s", numofbytes, filename);
+       return 0;
+}
        
 static command_t CommandTable[] =  {
        {"help",        CmdHelp,                        1, "This help"},
@@ -1031,9 +1186,9 @@ static command_t CommandTable[] =  {
        {"load",        CmdLegicLoad,           0, "<filename> -- Restore samples"},
        {"sim",         CmdLegicRfSim,          0, "[phase drift [frame drift [req/resp drift]]] Start tag simulator (use after load or read)"},
        {"write",       CmdLegicRfWrite,        0, "<offset> <length> <iv> -- Write sample buffer (user after load or read)"},
-       {"writeraw",CmdLegicRfRawWrite, 0, "<address> <value> <iv> -- Write direct to address"},
-       {"fill",        CmdLegicRfFill,         0, "<offset> <length> <value> -- Fill/Write tag with constant value"},
-       {"crc8",        CmdLegicCalcCrc8,       1, "Calculate Legic CRC8 over given hexbytes"},
+       {"crc8",        CmdLegicCalcCrc8,       1, "Calculate Legic CRC8 over given hexbytes"}, 
+       {"eload",       CmdLegicELoad,          1, "Load binary dump to emulator memory"},
+       {"esave",       CmdLegicESave,          1, "Save emulator memory to binary file"},
        {NULL, NULL, 0, NULL}
 };
 
index fecde8e321bc58579f73840fa6bef528e107e38b..1de3d1cbb8915c5ad2f233c9221341f73f70e481 100644 (file)
@@ -32,14 +32,18 @@ int CmdLegicSave(const char *Cmd);
 int CmdLegicRfSim(const char *Cmd);
 int CmdLegicRfWrite(const char *Cmd);
 int CmdLegicRfRawWrite(const char *Cmd);
-int CmdLegicRfFill(const char *Cmd);
 int CmdLegicCalcCrc8(const char *Cmd);
 int CmdLegicDump(const char *Cmd);
 int CmdLegicReader(const char *Cmd);
 
+int CmdLegicELoad(const char *Cmd);
+int CmdLegicESave(const char *Cmd);
+
 int HFLegicReader(const char *Cmd, bool verbose);
 int legic_print_type(uint32_t tagtype, uint8_t spaces);
 int legic_get_type(legic_card_select_t *card);
+void legic_chk_iv(uint32_t *iv);
+void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes);
 
 int usage_legic_calccrc8(void);
 int usage_legic_load(void);
@@ -47,7 +51,6 @@ int usage_legic_rdmem(void);
 int usage_legic_sim(void);
 int usage_legic_write(void);
 int usage_legic_rawwrite(void);
-int usage_legic_fill(void);
 int usage_legic_reader(void);
 int usage_legic_info(void);
 int usage_legic_dump(void);
index 1c61ebcfb5efc8c875de7bc2dd983bafb4dba0cd..82e4cecbfc0391a4244af809a707b2cc3e033d46 100644 (file)
@@ -138,6 +138,8 @@ typedef struct {
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
 #define CMD_LEGIC_INFO                                                                                                   0x03BC
+#define CMD_LEGIC_ESET                                                                                                   0x03BD
+#define CMD_LEGIC_EGET                                                                                                   0x03BE
 
 #define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
index 680e6da91e957861120ba7a028aa1703ee59e604..2347ffe55d0fe5b3d9e453c8ab94120fddf4177c 100644 (file)
@@ -104,7 +104,10 @@ local _commands = {
        CMD_EPA_PACE_REPLAY =                                                0x038B,
 
        CMD_LEGIC_INFO =                                                                                                         0x03BC,
-       
+       CMD_LEGIC_ESET =                                                                                                         0x03BD,
+       CMD_LEGIC_EGET =                                                                                                         0x03BE,
+
+
        CMD_ICLASS_READCHECK =                                               0x038F,
        CMD_ICLASS_CLONE =                                                   0x0390,
        CMD_ICLASS_DUMP =                                                    0x0391,
index a0ce422365d65b1384bb6ed225ee2ce6bc632f21..3fd2cedd9cdaf256d0c41f9ae2c762fb7bcac2e0 100644 (file)
@@ -147,6 +147,8 @@ typedef struct{
 #define CMD_EPA_PACE_REPLAY                                               0x038B
 
 #define CMD_LEGIC_INFO                                                                                                   0x03BC
+#define CMD_LEGIC_ESET                                                                                                   0x03BD
+#define CMD_LEGIC_EGET                                                                                                   0x03BE
 
 #define CMD_ICLASS_READCHECK                                              0x038F
 #define CMD_ICLASS_CLONE                                                  0x0390
Impressum, Datenschutz