CHG: minor spelling

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 9a6983ffcb50814f9f96e52568dc60695b6ce086..a9a178268395c6d1eab759c0d0ae998e063a1765 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -11,74 +11,495 @@
 #include "cmdhfmfu.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "cmdhfmfu.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"

+#include "mifare.h"
+#include "util.h"
+#include "../common/protocols.h"
+
+#define MAX_UL_BLOCKS          0x0f
+#define MAX_ULC_BLOCKS         0x2f
+#define MAX_ULEV1a_BLOCKS      0x0b
+#define MAX_ULEV1b_BLOCKS      0x20
+#define MAX_NTAG_213           0x2c
+#define MAX_NTAG_215           0x86
+#define MAX_NTAG_216           0xE6
+
+typedef enum TAGTYPE_UL {
+       UNKNOWN         = 0,
+       UL                      = 1,
+       UL_C            = 2,
+       UL_EV1_48       = 4,
+       UL_EV1_128      = 8,
+       NTAG            = 16,
+       NTAG_213        = 32,
+       NTAG_215        = 64,
+       NTAG_216        = 128,
+       MAGIC           = 256,
+       UL_MAGIC        = UL | MAGIC,
+       UL_C_MAGIC      = UL_C | MAGIC,
+       UL_ERROR        = 0xFFFF,
+       
+} TagTypeUL_t;

 
 

-#define MAX_ULTRA_BLOCKS   0x0f
-#define MAX_ULTRAC_BLOCKS  0x2f
-//#define MAX_ULTRAC_BLOCKS  0x2c
-
+uint8_t default_3des_keys[7][16] = {
+               { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
+               { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
+               { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
+               { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
+               { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
+               { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
+               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
+       };
+       

 static int CmdHelp(const char *Cmd);
 
 static int CmdHelp(const char *Cmd);
 

-int CmdHF14AMfUInfo(const char *Cmd){
+char* getProductTypeStr( uint8_t id){
+
+       static char buf[20];
+       char *retStr = buf;
+
+       switch(id) {
+        case 3:
+               sprintf(retStr, "0x%02X %s", id, "(Ultralight)");
+               break;
+       case 4:
+               sprintf(retStr, "0x%02X %s", id, "(NTAG)");
+               break;
+       default:
+               sprintf(retStr, "0x%02X ", id, "(unknown)");
+               break;
+       }
+       return buf;
+}

 
 

-       uint8_t datatemp[7] = {0x00};
-       uint8_t isOK  = 0;
-       uint8_t *data = NULL;
+/*
+  The 7 MSBits (=n) code the storage size itself based on 2^n, 
+  the LSBit is set to '0' if the size is exactly 2^n
+  and set to '1' if the storage size is between 2^n and 2^(n+1). 
+*/
+char* getUlev1CardSizeStr( uint8_t fsize ){
+ 
+       static char buf[30];
+       char *retStr = buf;
+
+       uint8_t usize = 1 << ((fsize >>1) + 1);
+       uint8_t lsize = 1 << (fsize >>1);
+       
+       // is  LSB set?
+       if (  fsize & 1 )
+               sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
+       else 
+               sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);             
+       return buf;
+}

 
 

-       UsbCommand c = {CMD_MIFAREU_READCARD, {0, 4}};
+static void ul_switch_on_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       SendCommand(&c);
+}
+
+static void ul_switch_off_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+       SendCommand(&c);
+}
+
+static int ul_send_cmd_raw( uint8_t *cmd, uint8_t len, uint8_t *response ) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC, len, 0}};
+       memcpy(c.d.asBytes, cmd, len);

        SendCommand(&c);
        UsbCommand resp;
        SendCommand(&c);
        UsbCommand resp;

+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;

 
 

-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-               isOK  = resp.arg[0] & 0xff;
-               data  = resp.d.asBytes;
+       if (resp.arg[0] > 0) 
+               memcpy(response, resp.d.asBytes, resp.arg[0]);

 
 

-               if (!isOK) {
-                       PrintAndLog("Error reading from tag");
-                       return -1;
-               }
-       } else {
-               PrintAndLog("Command execute timed out");
+       return resp.arg[0];
+}
+
+static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t len, uint8_t *response, bool append_crc ) {
+       
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT , len, 0}};
+       if (append_crc)
+               c.arg[0] |= ISO14A_APPEND_CRC;
+       
+       memcpy(c.d.asBytes, cmd, len);  
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+
+       if (resp.arg[0] > 0)
+               memcpy(response, resp.d.asBytes, resp.arg[0]);
+
+       return resp.arg[0];
+}
+
+static int ul_select( iso14a_card_select_t *card ){
+       
+       ul_switch_on_field();
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+               ul_switch_off_field();

                return -1;
        }
        
                return -1;
        }
        

-       PrintAndLog("");
-       PrintAndLog("-- Mifare Ultralight / Ultralight-C Tag Information ---------");
-       PrintAndLog("-------------------------------------------------------------");
+       if (resp.arg[0] > 0) {
+               memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+       }
+       return resp.arg[0];
+}
+
+static int ul_read( uint8_t page, uint8_t *response ){
+       
+       uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response);
+       if ( len == -1 )
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulc_requestAuthentication( uint8_t blockNo, uint8_t *nonce ){
+       
+       uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce);
+       if ( len == -1 ) 
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack ){
+       
+       uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack);
+       if ( len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_getVersion( uint8_t *response ){
+       
+       uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; 
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response);
+       if ( len == -1 )
+               ul_switch_off_field();
+       return len;
+}
+
+// static int ulev1_fastRead( uint8_t startblock, uint8_t endblock, uint8_t *response ){
+       
+       // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock};
+       
+       // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){
+               // ul_switch_off_field();
+               // return -1;
+       // }
+       // return 0;
+// }
+
+static int ulev1_readCounter( uint8_t counter, uint8_t *response ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ul_print_CC(uint8_t *data) {
+       if(data[0] != 0xe1) {
+               PrintAndLog("no NDEF message");
+               return -1;              // no NDEF message
+       }
+
+       PrintAndLog("Capability Container: %s", sprint_hex(data,4) );
+       PrintAndLog("  %02X: NDEF Magic Number", data[0]); 
+       PrintAndLog("  %02X: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
+       PrintAndLog("  %02X: Physical Memory Size of this tag: %d bytes", data[2], (data[2] + 1) * 8);
+       PrintAndLog("  %02X: %s / %s", data[3], 
+                               (data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
+                               (data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+       return 0;                               
+}

 
 

+static int ul_print_version(uint8_t *data){    
+       PrintAndLog("VERSION COMMAND: %s", sprint_hex(data, 8) );
+       PrintAndLog("      Vendor ID : 0x%02X, Manufacturer: %s", data[1], getTagInfo(data[1]));
+       PrintAndLog("   Product type : %s"              , getProductTypeStr(data[2]));
+       PrintAndLog("Product subtype : 0x%02X %s"       , data[3], (data[3]==1) ?"17 pF":"50pF");
+       PrintAndLog("  Major version : 0x%02X"  , data[4]);
+       PrintAndLog("  Minor version : 0x%02X"  , data[5]);
+       PrintAndLog("           Size : %s", getUlev1CardSizeStr(data[6]));
+       PrintAndLog("  Protocol type : 0x%02X"  , data[7]);
+       return 0;
+}
+
+static int ul_print_type(uint16_t tagtype){
+       if ( tagtype & UL )     
+               PrintAndLog("      TYPE : MIFARE Ultralight (MF0ICU1) %s", (tagtype & MAGIC)?"<magic>":"");
+       else if ( tagtype & UL_C)
+               PrintAndLog("      TYPE : MIFARE Ultralight C (MF0ULC) %s", (tagtype & MAGIC)?"<magic>":"" );
+       else if ( tagtype & UL_EV1_48)
+               PrintAndLog("      TYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)"); 
+       else if ( tagtype & UL_EV1_128) 
+               PrintAndLog("      TYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101");
+       else if ( tagtype & NTAG_213 )
+               PrintAndLog("      TYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)");
+       else if ( tagtype & NTAG_215 )
+               PrintAndLog("      TYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)");
+       else if ( tagtype & NTAG_216 )
+               PrintAndLog("      TYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)");
+       else
+               PrintAndLog("      TYPE : Unknown %x",tagtype); 
+       return 0;
+}
+
+uint16_t GetHF14AMfU_Type(void){
+
+       TagTypeUL_t tagtype = UNKNOWN;
+       iso14a_card_select_t card;
+       uint8_t version[10] = {0x00};
+       uint8_t nonce1[11] = {0x00};
+       uint8_t nonce2[11] = {0x00};
+       int status = 0;
+       int len;
+
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("Error: couldn't select");
+               return UL_ERROR;
+       }
+
+       // Ultralight - ATQA / SAK 
+       if ( card.atqa[1] != 0x00 && card.atqa[0] != 0x44 && card.sak != 0x00 ) {
+               ul_switch_off_field();
+               return UL_ERROR;
+       }
+       
+       len  = ulev1_getVersion(version);
+       
+       switch (len) {
+               case -1:
+                       tagtype = (UL | UL_C);
+                       break;
+               case 0x0A: {
+               
+                       if ( version[2] == 0x03 && version[6] == 0x0B ) 
+                               tagtype = UL_EV1_48;
+                       else if ( version[2] == 0x03 && version[6] != 0x0B ) 
+                               tagtype = UL_EV1_128;                   
+                       else if ( version[2] == 0x04 && version[6] == 0x0F ) 
+                               tagtype = NTAG_213;
+                       else if ( version[2] == 0x04 && version[6] != 0x11 ) 
+                               tagtype = NTAG_215;     
+                       else if ( version[2] == 0x04 && version[6] == 0x13 ) 
+                               tagtype = NTAG_216;
+                       else if ( version[2] == 0x04 ) 
+                               tagtype = NTAG;
+                       
+                       break;
+                       }
+               case 0x01:{
+                       tagtype = UL_C; 
+                       break;
+               }
+               case 0x00: {
+                       tagtype = UL;
+                       break;
+               }
+               default :{
+                       tagtype = UNKNOWN;
+                       break;
+               }
+       }
+
+       if ((tagtype & ( UL_C | UL ))) {
+               // Magic UL-C, by observation,
+               // it seems to have a static nonce response to 0x1A command.
+               status = ul_select(&card);
+               status = ulc_requestAuthentication(0, nonce1);
+               if ( status > 0 ) {
+                       status = ulc_requestAuthentication(0, nonce2);
+                       
+                       if ( !memcmp(nonce1, nonce2, 11)) {
+                               tagtype = UL_C_MAGIC;
+                       }
+                       else
+                               tagtype = UL_C;
+                               
+               } else {
+                       tagtype = UL;
+               }
+       }
+
+       //PrintAndLog("ICE %d", tagtype);
+       //Magic Ultralight test here.  It takes present UID, and tries to write it back.
+       if ( (tagtype & UL) ){
+               // read 3des key or PWD,  
+               // if response bytes == all zeros its a NORMAL tag.
+               //return UL_MAGIC;
+       }
+
+       ul_switch_off_field();
+       return tagtype;
+}      
+
+int CmdHF14AMfUInfo(const char *Cmd){
+
+       uint8_t datatemp[7] = {0x00};
+       uint8_t data[16] = {0x00};
+       iso14a_card_select_t card;
+       uint8_t *key;
+       int status;     
+
+       PrintAndLog("\n-- Tag Information ---------");
+       PrintAndLog("-------------------------------------------------------------");
+       
+       TagTypeUL_t tagtype = GetHF14AMfU_Type();
+       if (tagtype == UL_ERROR) return -1;
+       
+       ul_print_type(tagtype);
+       
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("Error: couldn't select");
+               ul_switch_off_field();
+               return status;
+       }
+       
+       // read pages 0,1,2,4 (should read 4pages)
+       status = ul_read(0, data);
+       if ( status == -1 ){
+               PrintAndLog("Error: tag didn't answer to READ");
+               ul_switch_off_field();
+               return status;
+       }
+       

        // UID
        memcpy( datatemp, data, 3);
        memcpy( datatemp+3, data+4, 4);
        
        // UID
        memcpy( datatemp, data, 3);
        memcpy( datatemp+3, data+4, 4);
        

-       PrintAndLog("MANUFACTURER : %s", getTagInfo(datatemp[0]));
-       PrintAndLog("         UID : %s ", sprint_hex(datatemp, 7));
+       PrintAndLog("       UID : %s ", sprint_hex(datatemp, 7));
+       PrintAndLog("    UID[0] : (Manufacturer Byte) = %02x, Manufacturer: %s",  datatemp[0], getTagInfo(datatemp[0]) );
+       

        // BBC
        // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
        int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
        if ( data[3] == crc0 )
        // BBC
        // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
        int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
        if ( data[3] == crc0 )

-               PrintAndLog("        BCC0 : %02x - Ok", data[3]);
+               PrintAndLog("      BCC0 : 0x%02X - Ok", data[3]);

        else
        else

-               PrintAndLog("        BCC0 : %02x - crc should be %02x", data[3], crc0);
+               PrintAndLog("      BCC0 : 0x%02X - crc should be %02x", data[3], crc0);

                
        int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
        if ( data[8] == crc1 )
                
        int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
        if ( data[8] == crc1 )

-               PrintAndLog("        BCC1 : %02x - Ok", data[8]);
+               PrintAndLog("      BCC1 : 0x%02X - Ok", data[8]);

        else
        else

-               PrintAndLog("        BCC1 : %02x - crc should be %02x", data[8], crc1 );
+               PrintAndLog("      BCC1 : 0x%02X - crc should be 0x%02X", data[8], crc1 );

        
        

-       PrintAndLog("    Internal : %s ", sprint_hex(data + 9, 1));
+       PrintAndLog("  Internal : %s ", sprint_hex(data + 9, 1));

        
        memcpy(datatemp, data+10, 2);
        
        memcpy(datatemp, data+10, 2);

-       PrintAndLog("        Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
-       PrintAndLog("  OneTimePad : %s ", sprint_hex(data + 3*4, 4));
+       PrintAndLog("      Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
+       PrintAndLog("OneTimePad : %s ", sprint_hex(data + 3*4, 4));

        PrintAndLog("");
        PrintAndLog("");

+       
+       

 
 

-       int len = CmdHF14AMfucAuth("K 0");
-//     PrintAndLog("CODE: %d",len);
-// Fix reading UL-C 's password higher blocks.
+       if ((tagtype & UL_C)){
+               PrintAndLog("--- Trying some Ultralight-C stuff");
+               // read pages 42,43
+               uint8_t ulc_conf[16] = {0x00};
+               status = ul_read(42, ulc_conf);
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ");
+                       ul_switch_off_field();
+                       return status;
+               }

        
        

-       PrintAndLog("Seems to be a Ultralight %s", (len==0) ? "-C" :"");
+               PrintAndLog("read UL-C Configuration bytes at page 42,43");
+               //PrintAndLog("      Lock : %s - %s", sprint_hex(datatemp, 2), printBits( 2, &datatemp) );
+               PrintAndLog("  Lock [42]: %s", sprint_hex(ulc_conf, 4)  );
+               PrintAndLog("Config [43]: %s", sprint_hex(ulc_conf+4, 4) );             
+
+               
+               // if magic, try read passwd?
+               if ((tagtype & UL_C_MAGIC)){
+                       // read pages 44,45,46,47
+                       uint8_t deskey[16] = {0x00};
+                       status = ul_read(44, deskey);
+                       if ( status == -1 ){
+                               PrintAndLog("Error: tag didn't answer to READ");
+                               ul_switch_off_field();
+                               return status;
+                       }
+                       PrintAndLog("  pwd0 [44]: %s", sprint_hex(deskey   ,4));
+                       PrintAndLog("  pwd1 [45]: %s", sprint_hex(deskey+4 ,4));                        
+                       PrintAndLog("  pwd2 [46]: %s", sprint_hex(deskey+8 ,4));
+                       PrintAndLog("  pwd3 [47]: %s", sprint_hex(deskey+12,4));
+
+               }
+               
+               PrintAndLog("Trying some default 3des keys");
+               for (uint8_t i = 0; i < 7; ++i ){
+                       key = default_3des_keys[i];
+                       if (try3DesAuthentication(key) == 1){
+                               PrintAndLog("Found default 3des key: %s", sprint_hex(key,16));
+                               return 0;
+                       }
+               }               
+       }
+       
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
+               uint8_t counter[4] = {0,0,0,0};
+               ulev1_readCounter(0,counter);
+               PrintAndLog("COUNTER: 0 :: %s",sprint_hex(counter,4));
+               ulev1_readCounter(1,counter);
+               PrintAndLog("COUNTER: 1 :: %s",sprint_hex(counter,4));
+               ulev1_readCounter(2,counter);
+               PrintAndLog("COUNTER: 2 :: %s",sprint_hex(counter,4));
+       }

        
        

+       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
+
+               PrintAndLog("--- Trying some Ultralight-EV1 / NTAG stuff");
+       
+               uint8_t version[10] = {0x00};
+               status  = ulev1_getVersion(version);
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to GETVERSION");
+                       ul_switch_off_field();
+                       return status;
+               }
+               ul_print_version(version);
+               
+               //********** TODO ********************************
+               // --problem, there is a failed pwd tries counter in UL-EV1
+               PrintAndLog("Trying some known EV1/NTAG passwords.");
+                               
+               uint8_t password[4] ={0xff,0xff,0xff,0xff};
+               uint8_t pack[4] = {0,0,0,0};
+               status = ulev1_requestAuthentication(password, pack);
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to AUTHENTICATE");
+                       ul_switch_off_field();
+                       return status;
+               }
+               PrintAndLog("Found default password: %s",sprint_hex(password, sizeof(password)));
+               PrintAndLog("Got PACK : %s", sprint_hex(pack,sizeof(pack)));
+       }
+       
+       if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
+               
+               PrintAndLog("--- Trying some NTAG stuff");
+               uint8_t cc[4] = {0x00};
+               status = ul_read(2, cc);
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ");
+                       ul_switch_off_field();
+                       return status;
+               }       
+               ul_print_CC(cc);        
+       }

        
        

+       ul_switch_off_field();

        return 0;
 }
 
        return 0;
 }
 


@@ -105,7 +526,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
        
        blockNo = param_get8(Cmd, 0);
 
        
        blockNo = param_get8(Cmd, 0);
 

-       if (blockNo > MAX_ULTRA_BLOCKS){
+       if (blockNo > MAX_UL_BLOCKS){

                PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
                return 1;
        }
                PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
                return 1;
        }


@@ -168,7 +589,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
                
        blockNo = param_get8(Cmd, 0);
 
                
        blockNo = param_get8(Cmd, 0);
 

-       if (blockNo > MAX_ULTRA_BLOCKS){
+       if (blockNo > MAX_UL_BLOCKS){

           PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight");
           return 1;
        }
           PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight");
           return 1;
        }


@@ -193,66 +614,126 @@ int CmdHF14AMfURdBl(const char *Cmd){
        return 0;
 }
 
        return 0;
 }
 

+int usage_hf_mfu_dump(void)
+{
+       PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
+       PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
+       PrintAndLog("It autodetects card type.\n");     
+       PrintAndLog("Usage:  hf mfu dump k <key> n <filename w/o .bin>");
+       PrintAndLog("   sample : hf mfu dump");
+       PrintAndLog("          : hf mfu dump n myfile");
+       return 0;
+}

 //
 //

-//  Mifare Ultralight / Ultralight-C;  Read and Dump Card Contents
+//  Mifare Ultralight / Ultralight-C / Ultralight-EV1
+//  Read and Dump Card Contents,  using auto detection of tag size.

 //
 //

+//  TODO: take a password to read UL-C / UL-EV1 tags.

 int CmdHF14AMfUDump(const char *Cmd){
 
        FILE *fout;
        char filename[FILE_PATH_SIZE] = {0x00};
        char * fnameptr = filename;
 int CmdHF14AMfUDump(const char *Cmd){
 
        FILE *fout;
        char filename[FILE_PATH_SIZE] = {0x00};
        char * fnameptr = filename;

-       
+       char* str = "Dumping Ultralight%s%s Card Data...";      

        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};

-       

        uint8_t *lockbytes_t2 = NULL;
        uint8_t lockbytes2[2] = {0x00};
        uint8_t *lockbytes_t2 = NULL;
        uint8_t lockbytes2[2] = {0x00};

-

        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};

-       
-       int i;
-       uint8_t BlockNo      = 0;
-       int Pages            = 16;
-
-       bool tmplockbit          = false;
-       uint8_t isOK         = 0;
-       uint8_t *data       = NULL;
+       uint8_t data[1024] = {0x00};
+       bool hasPwd = false;
+       int i = 0;
+       int Pages = 16;
+       bool tmplockbit = false;
+       uint8_t dataLen=0;
+       uint8_t cmdp =0;
+       //uint8_t key[16]= {0x00};
+       uint8_t *key = NULL;
+       size_t fileNlen = 0;
+       bool errors = FALSE;
+
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_hf_mfu_dump();
+               case 'k':
+               case 'K':
+                       dataLen = param_gethex(Cmd, cmdp+1, data, 32);
+                       if (dataLen) {
+                               errors = true; 
+                       } else {
+                               //memcpy(key, data, 16);
+                               key = SwapEndian64(data, 16);
+                               PrintAndLog("3des key: %s",sprint_hex(key, 16));
+                       }   
+                       cmdp += 2;
+                       hasPwd = true;
+                       break;
+               case 'n':
+               case 'N':
+                       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;
+       }

 
 

-       char cmdp = param_getchar(Cmd, 0);
+       //Validations
+       if(errors) return usage_hf_mfu_dump();

        
        

-       if (cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Reads all pages from Mifare Ultralight or Ultralight-C tag.");
-               PrintAndLog("It saves binary dump into the file `filename.bin` or `cardUID.bin`");              
-               PrintAndLog("Usage:  hf mfu dump <c> <filename w/o .bin>");
-               PrintAndLog("     <c>  optional cardtype c == Ultralight-C, Defaults to Ultralight");
-               PrintAndLog("     sample: hf mfu dump");
-               PrintAndLog("           : hf mfu dump myfile");
-               PrintAndLog("           : hf mfu dump c myfile");
-               return 0;
+       TagTypeUL_t tagtype = GetHF14AMfU_Type();
+       if (tagtype == UL_ERROR) return -1;
+       
+       if ( tagtype & UL ) {
+               Pages = 16;
+               PrintAndLog(str,"", (tagtype & MAGIC)?" (magic)":"" );
+       }
+       else if ( tagtype & UL_C ) {
+               Pages = 44;
+               PrintAndLog(str,"-C", (tagtype & MAGIC)?" (magic)":"" );
+       }
+       else if ( tagtype & UL_EV1_48 ) {
+               Pages = 18; 
+               PrintAndLog(str," EV1_48","");
+       }
+       else if ( tagtype & UL_EV1_128 ) {
+               Pages = 32; 
+               PrintAndLog(str," EV1_128","");
+       } else {
+               Pages = 16;
+               PrintAndLog("Dumping unknown Ultralight, using default values.");

        }
        }

-
-       // UL or UL-C?
-       Pages = (cmdp == 'c' || cmdp == 'C') ? 44 : 16;

        
        

-       PrintAndLog("Dumping Ultralight%s Card Data...", (Pages ==16)?"":"-C");
-               
-       UsbCommand c = {CMD_MIFAREU_READCARD, {BlockNo,Pages}};
+       UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}};
+       if ( hasPwd ) {
+               c.arg[2] = 1;
+               memcpy(c.d.asBytes, key, 16);
+       }

        SendCommand(&c);
        UsbCommand resp;
        SendCommand(&c);
        UsbCommand resp;

-
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-               isOK  = resp.arg[0] & 0xff;
-               if (!isOK) {                
-                       PrintAndLog("Command error");
-                       return 0;
-               }
-               data  = resp.d.asBytes;
-       } else {
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {

                PrintAndLog("Command execute time-out");
                PrintAndLog("Command execute time-out");

-               return 0;
+               return 1;

        }
        }

-               
+       
+       uint8_t isOK = resp.arg[0] & 0xff;
+       if (isOK) {
+               memcpy(data, resp.d.asBytes, resp.arg[1]);
+       } else {
+               PrintAndLog("Failed reading block: (%02x)", i);
+               return 1;
+       }
+

        // Load lock bytes.
        int j = 0;
        
        // Load lock bytes.
        int j = 0;
        


@@ -265,7 +746,6 @@ int CmdHF14AMfUDump(const char *Cmd){
        
        // Load bottom lockbytes if available
        if ( Pages == 44 ) {
        
        // Load bottom lockbytes if available
        if ( Pages == 44 ) {

-               

                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
                lockbytes2[1] = lockbytes_t2[3];
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
                lockbytes2[1] = lockbytes_t2[3];


@@ -274,13 +754,16 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
                }
        }
 

+       // add keys
+       if (hasPwd){
+               memcpy(data + Pages*4, key, 16);
+               Pages += 4;
+       }

        for (i = 0; i < Pages; ++i) {
        for (i = 0; i < Pages; ++i) {

-               

                if ( i < 3 ) {
                        PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
                        continue;
                }
                if ( i < 3 ) {
                        PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
                        continue;
                }

-

                switch(i){
                        case 3: tmplockbit = bit[4]; break;
                        case 4: tmplockbit = bit[3]; break;
                switch(i){
                        case 3: tmplockbit = bit[4]; break;
                        case 4: tmplockbit = bit[3]; break;


@@ -328,26 +811,15 @@ int CmdHF14AMfUDump(const char *Cmd){
                PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
        }  
        
                PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
        }  
        

-       int len = 0;
-       if ( Pages == 16 )
-               len = param_getstr(Cmd,0,filename);
-       else
-               len = param_getstr(Cmd,1,filename);
-
-       if (len > FILE_PATH_SIZE-5) len = FILE_PATH_SIZE-5;
-

        // user supplied filename?
        // user supplied filename?

-       if (len < 1) {
-       
+       if (fileNlen < 1) {

                // UID = data 0-1-2 4-5-6-7  (skips a beat)
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
                // UID = data 0-1-2 4-5-6-7  (skips a beat)
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",

-                       data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
-
+                       data[0], data[1], data[2], data[4], data[5], data[6], data[7]);

        } else {
        } else {

-               sprintf(fnameptr + len," .bin");
+               sprintf(fnameptr + fileNlen," .bin");

        }
 
        }
 

-

        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
                return 1;       
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
                return 1;       


@@ -377,30 +849,21 @@ void rol (uint8_t *data, const size_t len){
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 

-       uint8_t default_keys[7][16] = {
-               { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
-               { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
-               { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
-               { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
-               { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
-               { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
-       };
-
-       char cmdp = param_getchar(Cmd, 0);
-       

        uint8_t keyNo = 0;
        bool errors = false;
        uint8_t keyNo = 0;
        bool errors = false;

+
+       char cmdp = param_getchar(Cmd, 0);
+

        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);

-               if(keyNo > 6) errors = true;
+               if(keyNo > 6) 
+                       errors = true;

        }
 
        }
 

-       if (cmdp == 'h' || cmdp == 'H') {
+       if (cmdp == 'h' || cmdp == 'H')

                errors = true;
                errors = true;

-       }
-
+       

        if (errors) {
                PrintAndLog("Usage:  hf mfu cauth k <key number>");
                PrintAndLog("      0 (default): 3DES standard key");
        if (errors) {
                PrintAndLog("Usage:  hf mfu cauth k <key number>");
                PrintAndLog("      0 (default): 3DES standard key");


@@ -415,109 +878,79 @@ int CmdHF14AMfucAuth(const char *Cmd){
                return 0;
        } 
 
                return 0;
        } 
 

-       uint8_t random_a[8]     = { 1,1,1,1,1,1,1,1 };
-       //uint8_t enc_random_a[8] = { 0 };
-       uint8_t random_b[8]     = { 0 };
-       uint8_t enc_random_b[8] = { 0 };
-       uint8_t random_a_and_b[16] = { 0 };
-       des3_context ctx        = { 0 };
-       uint8_t *key = default_keys[keyNo];
+       uint8_t *key = default_3des_keys[keyNo];
+       if (try3DesAuthentication(key)>0)
+               PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
+       else
+               PrintAndLog("Authentication failed");
+                       
+       return 0;
+}
+
+int try3DesAuthentication( uint8_t *key){
+       

        uint8_t blockNo = 0;
        uint32_t cuid = 0;
 
        uint8_t blockNo = 0;
        uint32_t cuid = 0;
 

-       //Auth1
+       des3_context ctx = { 0 };
+       
+       uint8_t random_a[8] = { 1,1,1,1,1,1,1,1 };
+       uint8_t random_b[8] = { 0 };
+       uint8_t enc_random_b[8] = { 0 };
+       uint8_t rnd_ab[16] = { 0 };
+       uint8_t iv[8] = { 0 };
+

        UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
        SendCommand(&c);
        UsbCommand resp;
        UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
        SendCommand(&c);
        UsbCommand resp;

-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-               uint8_t isOK  = resp.arg[0] & 0xff;
-               cuid  = resp.arg[1];
-               uint8_t * data= resp.d.asBytes;
-
-               if (isOK){
-                       memcpy(enc_random_b,data+1,8);
-               } else {
-                       PrintAndLog("Auth failed");
-                       return 2;
-               }               
-       } else {
-               PrintAndLog("Command execute timeout");
-               return 1;
-       }
-       uint8_t iv[8]           = { 0 };
-
-       PrintAndLog("     RndA  :%s",sprint_hex(random_a, 8));
-       PrintAndLog("     enc(RndB):%s",sprint_hex(enc_random_b, 8));
+       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) )    return -1;
+       if ( !(resp.arg[0] & 0xff) ) return -2;
+       
+       cuid  = resp.arg[1];    
+       memcpy(enc_random_b,resp.d.asBytes+1,8);

 
        des3_set2key_dec(&ctx, key);
 
        des3_set2key_dec(&ctx, key);

-
-       des3_crypt_cbc(&ctx      // des3_context *ctx
-               , DES_DECRYPT        // int mode
-               , sizeof(random_b)   // size_t length
-               , iv                 // unsigned char iv[8]
-               , enc_random_b       // const unsigned char *input
-               , random_b           // unsigned char *output
-               );
-
-       PrintAndLog("     RndB:%s",sprint_hex(random_b, 8));
+       // context, mode, length, IV, input, output 
+       des3_crypt_cbc( &ctx, DES_DECRYPT, sizeof(random_b), iv , enc_random_b , random_b);

 
        rol(random_b,8);
 
        rol(random_b,8);

-       memcpy(random_a_and_b  ,random_a,8);
-       memcpy(random_a_and_b+8,random_b,8);
+       memcpy(rnd_ab  ,random_a,8);
+       memcpy(rnd_ab+8,random_b,8);
+       
+       //PrintAndLog("      RndA  :%s", sprint_hex(random_a, 8));
+       //PrintAndLog("  enc(RndB) :%s", sprint_hex(enc_random_b, 8));
+       //PrintAndLog("       RndB :%s", sprint_hex(random_b, 8));
+       //PrintAndLog("        A+B :%s", sprint_hex(rnd_ab, 16));

        
        

-       PrintAndLog("     A+B:%s",sprint_hex(random_a_and_b, 16));
-

        des3_set2key_enc(&ctx, key);
        des3_set2key_enc(&ctx, key);

-
-       des3_crypt_cbc(&ctx          // des3_context *ctx
-               , DES_ENCRYPT            // int mode
-               , sizeof(random_a_and_b)   // size_t length
-               , enc_random_b           // unsigned char iv[8]
-               , random_a_and_b         // const unsigned char *input
-               , random_a_and_b         // unsigned char *output
-               );
-
-       PrintAndLog("enc(A+B):%s",sprint_hex(random_a_and_b, 16));
+       // context, mode, length, IV, input, output 
+       des3_crypt_cbc(&ctx, DES_ENCRYPT, sizeof(rnd_ab), enc_random_b, rnd_ab, rnd_ab);

 
        //Auth2
 
        //Auth2

-       UsbCommand d = {CMD_MIFAREUC_AUTH2, {cuid}};
-       memcpy(d.d.asBytes,random_a_and_b, 16);
-       SendCommand(&d);
+       c.cmd = CMD_MIFAREUC_AUTH2;
+       c.arg[0] = cuid;
+       memcpy(c.d.asBytes, rnd_ab, 16);
+       SendCommand(&c);

 
 

-       UsbCommand respb;
-       if (WaitForResponseTimeout(CMD_ACK,&respb,1500)) {
-               uint8_t  isOK  = respb.arg[0] & 0xff;
-               uint8_t * data2= respb.d.asBytes;
+       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;                          
+       if ( !(resp.arg[0] & 0xff)) return -2;
+       
+       uint8_t enc_resp[8] = { 0 };
+       uint8_t resp_random_a[8] = { 0 };
+       memcpy(enc_resp, resp.d.asBytes+1, 8);

 
 

-               if (isOK){
-                       PrintAndLog("enc(RndA'):%s", sprint_hex(data2+1, 8));
-                       
-                       uint8_t foo[8] = { 0 };
-                       uint8_t bar[8] = { 0 };
-                       memcpy(foo, data2+1, 8);
-                       des3_set2key_dec(&ctx, key);
-
-                       des3_crypt_cbc(&ctx    // des3_context *ctx
-                               , DES_DECRYPT      // int mode
-                               , 8      // size_t length
-                               , enc_random_b     // unsigned char iv[8]
-                               , foo           // const unsigned char *input
-                               , bar   // unsigned char *output
-                       );
+       des3_set2key_dec(&ctx, key);
+       // context, mode, length, IV, input, output
+       des3_crypt_cbc( &ctx, DES_DECRYPT, 8, enc_random_b, enc_resp, resp_random_a);

 
 

-                       PrintAndLog("--> : %s  : <-- Should be equal to our RndA",sprint_hex(bar, 8));
+       //PrintAndLog("   enc(A+B) :%s", sprint_hex(rnd_ab, 16));
+       //PrintAndLog(" enc(RndA') :%s", sprint_hex(enc_resp, 8));

 
 

-                       
-               } else {
-                       return 2;
-               }
-               
-       } else {
-               PrintAndLog("Command execute timeout");
-               return 1;
-       } 
+       if ( !memcmp(resp_random_a, random_a, 8))
+               return 1;       

        return 0;
 }
        return 0;
 }

+

 /**
 A test function to validate that the polarssl-function works the same 
 was as the openssl-implementation. 
 /**
 A test function to validate that the polarssl-function works the same 
 was as the openssl-implementation. 


@@ -614,6 +1047,7 @@ int CmdTestDES(const char * cmd)
        return 0;       
 }
 **/
        return 0;       
 }
 **/

+

 //
 // Ultralight C Read Single Block
 //
 //
 // Ultralight C Read Single Block
 //


@@ -629,7 +1063,7 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
                PrintAndLog("Usage:  hf mfu crdbl  <block number> <password>");
                PrintAndLog("");
                PrintAndLog("sample: hf mfu crdbl 0");
                PrintAndLog("Usage:  hf mfu crdbl  <block number> <password>");
                PrintAndLog("");
                PrintAndLog("sample: hf mfu crdbl 0");

-               PrintAndLog("        hf mfu crdbl 0 112233445566778899AABBCCDDEEFF");
+               PrintAndLog("        hf mfu crdbl 0 00112233445566778899AABBCCDDEEFF");

                return 0;
        }       
                
                return 0;
        }       
                


@@ -639,7 +1073,7 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
                return 1;
        }
        
                return 1;
        }
        

-       if (blockNo > MAX_ULTRAC_BLOCKS ){
+       if (blockNo > MAX_ULC_BLOCKS ){

                PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
                return 1;
        } 
                PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
                return 1;
        } 


@@ -701,7 +1135,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
        }
        
        blockNo = param_get8(Cmd, 0);
        }
        
        blockNo = param_get8(Cmd, 0);

-       if (blockNo > MAX_ULTRAC_BLOCKS ){
+       if (blockNo > MAX_ULC_BLOCKS ){

                PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!");
                return 1;
        }
                PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!");
                return 1;
        }


@@ -752,7 +1186,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
 //
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
 //
 int CmdHF14AMfucSetPwd(const char *Cmd){
 

-       uint8_t pwd[16] = {0x00};
+       uint8_t pwd[16] = {0x00};       

        
        char cmdp = param_getchar(Cmd, 0);
        
        
        char cmdp = param_getchar(Cmd, 0);
        


@@ -793,16 +1227,19 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 }
 
 //
 }
 
 //

-// Mifare Ultraligh - Set UID
+// Magic UL / UL-C tags  - Set UID

 //
 int CmdHF14AMfucSetUid(const char *Cmd){
 
 //
 int CmdHF14AMfucSetUid(const char *Cmd){
 

+       UsbCommand c;
+       UsbCommand resp;

        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
                PrintAndLog("Usage:  hf mfu setuid <uid (14 hex symbols)>");
                PrintAndLog("       [uid] - (14 hex symbols)");
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
                PrintAndLog("Usage:  hf mfu setuid <uid (14 hex symbols)>");
                PrintAndLog("       [uid] - (14 hex symbols)");

+               PrintAndLog("\nThis only works for Magic Ultralight tags.");

                PrintAndLog("");
                PrintAndLog("sample: hf mfu setuid 11223344556677");
                PrintAndLog("");
                PrintAndLog("");
                PrintAndLog("sample: hf mfu setuid 11223344556677");
                PrintAndLog("");


@@ -810,27 +1247,60 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        }
        
        if (param_gethex(Cmd, 0, uid, 14)) {
        }
        
        if (param_gethex(Cmd, 0, uid, 14)) {

-               PrintAndLog("Password must include 14 HEX symbols");
+               PrintAndLog("UID must include 14 HEX symbols");

                return 1;
        }
 
                return 1;
        }
 

-       UsbCommand c = {CMD_MIFAREU_SETUID};    
-       memcpy( c.d.asBytes, uid, 14);
+       // read block2. 
+       c.cmd = CMD_MIFAREU_READBL;
+       c.arg[0] = 2;

        SendCommand(&c);
        SendCommand(&c);

-
-       UsbCommand resp;        
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
-               if ( (resp.arg[0] & 0xff) == 1)
-                       PrintAndLog("New UID: %s", sprint_hex(uid,14));
-               else{
-                       PrintAndLog("Failed writing new uid");
-                       return 1;
-               }
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+               PrintAndLog("Command execute timeout");
+               return 2;

        }
        }

-       else {
-               PrintAndLog("command execution time out");
-               return 1;
+       
+       // save old block2.
+       uint8_t oldblock2[4] = {0x00};
+       memcpy(resp.d.asBytes, oldblock2, 4);
+       
+       // block 0.
+       c.cmd = CMD_MIFAREU_WRITEBL;
+       c.arg[0] = 0;
+       c.d.asBytes[0] = uid[0];
+       c.d.asBytes[1] = uid[1];
+       c.d.asBytes[2] = uid[2];
+       c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
+       SendCommand(&c);
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+               PrintAndLog("Command execute timeout");
+               return 3;
+       }
+       
+       // block 1.
+       c.arg[0] = 1;
+       c.d.asBytes[0] = uid[3];
+       c.d.asBytes[1] = uid[4];
+       c.d.asBytes[2] = uid[5];
+       c.d.asBytes[3] = uid[6];
+       SendCommand(&c);
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+               PrintAndLog("Command execute timeout");
+               return 4;
+       }
+
+       // block 2.
+       c.arg[0] = 2;
+       c.d.asBytes[0] = uid[3] ^ uid[4] ^ uid[5] ^ uid[6];
+       c.d.asBytes[1] = oldblock2[1];
+       c.d.asBytes[2] = oldblock2[2];
+       c.d.asBytes[3] = oldblock2[3];
+       SendCommand(&c);
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
+               PrintAndLog("Command execute timeout");
+               return 5;

        }
        }

+       

        return 0;
 }
 
        return 0;
 }
 


@@ -839,6 +1309,9 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
        uint8_t iv[8] = { 0x00 };
        uint8_t block = 0x07;
        
        uint8_t iv[8] = { 0x00 };
        uint8_t block = 0x07;
        

+       // UL-EV1
+       //04 57 b6 e2 05 3f 80 UID
+       //4a f8 4b 19   PWD

        uint8_t uid[] = { 0xF4,0xEA, 0x54, 0x8E };
        uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
        uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
        uint8_t uid[] = { 0xF4,0xEA, 0x54, 0x8E };
        uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
        uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };


@@ -930,24 +1403,20 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
        // return;
 // }
 
        // return;
 // }
 

-//------------------------------------
-// Menu Stuff
-//------------------------------------

 static command_t CommandTable[] =
 {
 static command_t CommandTable[] =
 {

-       {"help",        CmdHelp,                        1,"This help"},
-       {"dbg",         CmdHF14AMfDbg,          0,"Set default debug mode"},
-       {"info",        CmdHF14AMfUInfo,        0,"Taginfo"},
-       {"dump",        CmdHF14AMfUDump,        0,"Dump MIFARE Ultralight / Ultralight-C tag to binary file"},
-       {"rdbl",        CmdHF14AMfURdBl,        0,"Read block  - MIFARE Ultralight"},
-       {"wrbl",        CmdHF14AMfUWrBl,        0,"Write block - MIFARE Ultralight"},    
-       {"crdbl",       CmdHF14AMfUCRdBl,       0,"Read block  - MIFARE Ultralight C"},
-       {"cwrbl",       CmdHF14AMfUCWrBl,       0,"Write block - MIFARE Ultralight C"},
-       {"cauth",       CmdHF14AMfucAuth,       0,"Ultralight C Authentication"},
-       //{"testdes", CmdTestDES ,        1, "Test DES"},
-       {"setpwd", CmdHF14AMfucSetPwd , 1, "Set 3des password [Ultralight-C only]"},
-       {"setuid", CmdHF14AMfucSetUid , 1, "Set UID"},
-       {"gen", CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
+       {"help",        CmdHelp,                        1, "This help"},
+       {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
+       {"info",        CmdHF14AMfUInfo,        0, "Tag information"},
+       {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C tag to binary file"},
+       {"rdbl",        CmdHF14AMfURdBl,        0, "Read block  - Ultralight"},
+       {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block - Ultralight"},    
+       {"crdbl",       CmdHF14AMfUCRdBl,       0, "Read block        - Ultralight C"},
+       {"cwrbl",       CmdHF14AMfUCWrBl,       0, "Write block       - Ultralight C"},
+       {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},
+       {"setpwd",      CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"},
+       {"setuid",      CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"},
+       {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},

        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };