CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index a22ff859721d05c01f49debfb9b3164d052198b7..1b43898039da18914e3c5211643a36ad5c44f4ec 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -14,14 +14,21 @@
 #include "mifare.h"
 #include "util.h"
 #include "protocols.h"
 #include "mifare.h"
 #include "util.h"
 #include "protocols.h"

+#include "data.h"

 
 #define MAX_UL_BLOCKS     0x0f
 
 #define MAX_UL_BLOCKS     0x0f

-#define MAX_ULC_BLOCKS    0x2f
-#define MAX_ULEV1a_BLOCKS 0x12
-#define MAX_ULEV1b_BLOCKS 0x20
+#define MAX_ULC_BLOCKS    0x2b
+#define MAX_ULEV1a_BLOCKS 0x13
+#define MAX_ULEV1b_BLOCKS 0x28
+#define MAX_NTAG_203      0x29
+#define MAX_NTAG_210      0x13
+#define MAX_NTAG_212      0x28

 #define MAX_NTAG_213      0x2c
 #define MAX_NTAG_215      0x86
 #define MAX_NTAG_216      0xe6
 #define MAX_NTAG_213      0x2c
 #define MAX_NTAG_215      0x86
 #define MAX_NTAG_216      0xe6

+#define MAX_MY_D_NFC       0xff
+#define MAX_MY_D_MOVE      0x25
+#define MAX_MY_D_MOVE_LEAN 0x0f

 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {


@@ -34,47 +41,125 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
                { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
 };
 
                { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
 };
 

-#define KEYS_PWD_COUNT 10
+#define KEYS_PWD_COUNT 1

 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default

+};

 
 

-       {0x4A,0xF8,0x4B,0x19}, // PACK 0xE5,0xBE -- italian bus (sniffed)
-       {0x33,0x6B,0xA1,0x19}, // PACK 0x9c,0x2d -- italian bus (sniffed)
-       {0xFF,0x90,0x6C,0xB2}, // PACK 0x12,0x9e -- italian bus (sniffed)       
-       {0x46,0x1c,0xA3,0x19}, // PACK 0xE9,0x5A -- italian bus (sniffed)
-       {0x35,0x1C,0xD0,0x19}, // PACK 0x9A,0x5a -- italian bus (sniffed)
+#define MAX_UL_TYPES 18
+uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {
+               UNKNOWN, UL, UL_C, 
+               UL_EV1_48, UL_EV1_128, NTAG,
+               NTAG_203, NTAG_210, NTAG_212,
+               NTAG_213, NTAG_215, NTAG_216,
+               MY_D, MY_D_NFC, MY_D_MOVE,
+               MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL};
+
+uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
+               MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS,
+               MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203,
+               MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212,
+               MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216, 
+               MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE,
+               MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};
+
+// Certain pwd generation algo nickname A.
+uint32_t ul_ev1_pwdgenA(uint8_t* uid) { 
+
+       uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
+       
+       uint32_t xortable[] = {
+                                               0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
+                                               0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
+                                               0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
+                                               0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
+                                               };
+
+       uint8_t entry[] = {0x00,0x00,0x00,0x00};
+       uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+       
+       num_to_bytes( xortable[pos], 4, entry);

 
 

-       {0x05,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- Amiiboo (sniffed) pikachu-b UID:
-       {0x7E,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
-       {0x02,0xE1,0xEE,0x36}, // PACK 0x80,0x80 -- AMiiboo (sniffed) sonic UID:  04d257 7ae33e8027
-       {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
-};
+       pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
+       pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4];
+       pwd[2] = entry[2] ^ uid[0] ^ uid[1] ^ uid[5];
+       pwd[3] = entry[3] ^ uid[6];

 
 

-#define MAX_UL_TYPES 13
-uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, 
-           NTAG, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC};
-uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, 
-           MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_213, MAX_NTAG_213, MAX_NTAG_215,
-           MAX_NTAG_216, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS};
+       return (uint32_t)bytes_to_num(pwd, 4);
+}
+
+// Certain pwd generation algo nickname B. (very simple)
+uint32_t ul_ev1_pwdgenB(uint8_t* uid) {

 
 

+       uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+       
+       pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
+       pwd[1] = uid[2] ^ uid[4] ^ 0x55;
+       pwd[2] = uid[3] ^ uid[5] ^ 0xAA;
+       pwd[3] = uid[4] ^ uid[6] ^ 0x55;
+       return (uint32_t)bytes_to_num(pwd, 4);
+}
+
+// Certain pwd generation algo nickname C.
+uint32_t ul_ev1_pwdgenC(uint8_t* uid){
+       uint32_t pwd = 0;
+       uint8_t base[] = {
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
+               0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72,
+               0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47,
+               0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa
+       };
+
+       memcpy(base, uid, 7);
+
+       for (int i = 0; i < 32; i += 4) {
+               uint32_t b = *(uint32_t *)(base + i);
+               pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd;
+       }
+       return BSWAP_32(pwd);
+}
+
+// pack generation for algo 1-3
+uint16_t ul_ev1_packgenA(uint8_t* uid){
+       uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
+       return pack;
+}
+uint16_t ul_ev1_packgenB(uint8_t* uid){
+       return 0x8080;
+}
+uint16_t ul_ev1_packgenC(uint8_t* uid){
+       return 0xaa55;
+}
+
+
+void ul_ev1_pwdgen_selftest(){
+       
+       uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10};
+       uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
+
+       uint8_t uid2[] = {0x04,0x1f,0x98,0xea,0x1e,0x3e,0x81};          
+       uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
+
+       uint8_t uid3[] = {0x04,0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
+       uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");
+       return;
+}

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

+// get version nxp product type 

 char *getProductTypeStr( uint8_t id){
 
        static char buf[20];
        char *retStr = buf;
 
        switch(id) {
 char *getProductTypeStr( uint8_t id){
 
        static char buf[20];
        char *retStr = buf;
 
        switch(id) {

-               case 3:
-                       sprintf(retStr, "%02X %s", id, "(Ultralight)");
-                       break;
-               case 4:
-                       sprintf(retStr, "%02X %s", id, "(NTAG)");
-                       break;
-               default:
-                       sprintf(retStr, "%02X %s", id, "(unknown)");
-                       break;
+               case 3: sprintf(retStr, "%02X, Ultralight", id); break;
+               case 4: sprintf(retStr, "%02X, NTAG", id); break;
+               default: sprintf(retStr, "%02X, unknown", id); break;

        }
        return buf;
 }
        }
        return buf;
 }


@@ -95,25 +180,28 @@ char *getUlev1CardSizeStr( uint8_t fsize ){
 
        // is  LSB set?
        if (  fsize & 1 )
 
        // is  LSB set?
        if (  fsize & 1 )

-               sprintf(retStr, "%02X (%u <-> %u bytes)",fsize, usize, lsize);
+               sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);

        else 
        else 

-               sprintf(retStr, "%02X (%u bytes)", fsize, lsize);               
+               sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);              

        return buf;
 }
 
 static void ul_switch_on_field(void) {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        return buf;
 }
 
 static void ul_switch_on_field(void) {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};

+       clearCommandBuffer();

        SendCommand(&c);
 }
 
 void ul_switch_off_field(void) {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
 }
 
 void ul_switch_off_field(void) {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};

+       clearCommandBuffer();

        SendCommand(&c);
 }
 
 static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC, cmdlen, 0}};
        memcpy(c.d.asBytes, cmd, cmdlen);
        SendCommand(&c);
 }
 
 static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC, cmdlen, 0}};
        memcpy(c.d.asBytes, cmd, cmdlen);

+       clearCommandBuffer();

        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;


@@ -123,33 +211,22 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
        memcpy(response, resp.d.asBytes, resplen);
        return resplen;
 }
        memcpy(response, resp.d.asBytes, resplen);
        return resplen;
 }

-/*
-static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength, bool append_crc ) {
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT , cmdlen, 0}};
-       if (append_crc)
-               c.arg[0] |= ISO14A_APPEND_CRC;
-
-       memcpy(c.d.asBytes, cmd, cmdlen);       
-       SendCommand(&c);
-       UsbCommand resp;
-       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-       if (!resp.arg[0] && responseLength) return -1;

 
 

-       uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-       memcpy(response, resp.d.asBytes, resplen);
-       return resplen;
-}
-*/

 static int ul_select( iso14a_card_select_t *card ){
 
        ul_switch_on_field();
 
        UsbCommand resp;
 static int ul_select( iso14a_card_select_t *card ){
 
        ul_switch_on_field();
 
        UsbCommand resp;

-       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
-       if (resp.arg[0] < 1) return -1;
+       bool ans = false;
+       ans = WaitForResponseTimeout(CMD_ACK, &resp, 1500);
+       if (!ans || resp.arg[0] < 1) {
+               PrintAndLog("iso14443a card select failed");
+               ul_switch_off_field();
+               return 0;
+       }

 
        memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
 
        memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));

-       return resp.arg[0];
+       return 1;

 }
 
 // This read command will at least return 16bytes.
 }
 
 // This read command will at least return 16bytes.


@@ -189,12 +266,13 @@ static int ulc_authentication( uint8_t *key, bool switch_off_field ){
 
        UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
        memcpy(c.d.asBytes, key, 16);
 
        UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
        memcpy(c.d.asBytes, key, 16);

+       clearCommandBuffer();

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

-       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return -1;
-       if ( resp.arg[0] == 1 ) return 0;
+       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
+       if ( resp.arg[0] == 1 ) return 1;

 
 

-       return -2;
+       return 0;

 }
 
 static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
 }
 
 static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){


@@ -204,6 +282,27 @@ static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t pa
        return len;
 }
 
        return len;
 }
 

+static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authenticationkey, uint8_t *pack, uint8_t packSize){
+       if ( hasAuthKey && (tagtype & UL_C)) {
+               //will select card automatically and close connection on error
+               if (!ulc_authentication(authenticationkey, false)) {
+                       PrintAndLog("Error: Authentication Failed UL-C");
+                       return 0;
+               }
+       } else {
+               if ( !ul_select(card) ) return 0;
+
+               if (hasAuthKey) {
+                       if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 2) {
+                               ul_switch_off_field();
+                               PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
+                               return 0;
+                       }
+               }
+       }
+       return 1;
+}
+

 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
 
        uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; 
 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
 
        uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; 


@@ -211,16 +310,6 @@ static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
        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)){
-               // return -1;
-       // }
-       // return 0;
-// }
-

 static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
 
        uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
 static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
 
        uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};


@@ -242,6 +331,37 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
        return len;
 }
 

+// Fudan check checks for which error is given for a command with incorrect crc
+// NXP UL chip responds with 01, fudan 00.
+// other possible checks:
+//  send a0 + crc 
+//  UL responds with 00, fudan doesn't respond
+//  or
+//  send a200 + crc
+//  UL doesn't respond, fudan responds with 00
+//  or
+//  send 300000 + crc (read with extra byte(s))
+//  UL responds with read of page 0, fudan doesn't respond.
+//
+// make sure field is off before calling this function
+static int ul_fudan_check( void ){
+       iso14a_card_select_t card;
+       if ( !ul_select(&card) ) 
+               return UL_ERROR;
+
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT, 4, 0}};
+
+       uint8_t cmd[4] = {0x30,0x00,0x02,0xa7}; //wrong crc on purpose  should be 0xa8
+       memcpy(c.d.asBytes, cmd, 4);
+       clearCommandBuffer();
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return UL_ERROR;
+       if (resp.arg[0] != 1) return UL_ERROR;
+
+       return (!resp.d.asBytes[0]) ? FUDAN_UL : UL; //if response == 0x00 then Fudan, else Genuine NXP
+}
+

 static int ul_print_default( uint8_t *data){
 
        uint8_t uid[7];
 static int ul_print_default( uint8_t *data){
 
        uint8_t uid[7];


@@ -254,103 +374,121 @@ static int ul_print_default( uint8_t *data){
        uid[6] = data[7];
 
        PrintAndLog("       UID : %s ", sprint_hex(uid, 7));
        uid[6] = data[7];
 
        PrintAndLog("       UID : %s ", sprint_hex(uid, 7));

-       PrintAndLog("    UID[0] : %02X, Manufacturer: %s",  uid[0], getTagInfo(uid[0]) );
-       if ( uid[0] == 0x05 ) {
+       PrintAndLog("    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]) );
+       if ( uid[0] == 0x05 && ((uid[1] & 0xf0) >> 4) == 2 ) { // is infineon and 66RxxP

                uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
                switch (chip){
                uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
                switch (chip){

-                       case 0xc2: PrintAndLog("   IC type : SLE 66R04P"); break;
-                       case 0xc4: PrintAndLog("   IC type : SLE 66R16P"); break;
-                       case 0xc6: PrintAndLog("   IC type : SLE 66R32P"); break;
+                       case 0xc2: PrintAndLog("   IC type : SLE 66R04P 770 Bytes"); break; //77 pages
+                       case 0xc4: PrintAndLog("   IC type : SLE 66R16P 2560 Bytes"); break; //256 pages
+                       case 0xc6: PrintAndLog("   IC type : SLE 66R32P 5120 Bytes"); break; //512 pages /2 sectors

                }
        }
        // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
        int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
        if ( data[3] == crc0 )
                }
        }
        // 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 : %02X, Ok", data[3]);

        else
        else

-               PrintAndLog("      BCC0 : %02X - crc should be %02X", data[3], crc0);
+               PrintAndLog("      BCC0 : %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 : %02X, Ok", data[8]);

        else
        else

-               PrintAndLog("      BCC1 : %02X - crc should be %02X", data[8], crc1 );
+               PrintAndLog("      BCC1 : %02X, crc should be %02X", data[8], crc1 );
+
+       PrintAndLog("  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );

 
 

-       PrintAndLog("  Internal : %02X - %s default", data[9], (data[9]==0x48)?"":"not" );

        PrintAndLog("      Lock : %s - %s",
                                sprint_hex(data+10, 2),
        PrintAndLog("      Lock : %s - %s",
                                sprint_hex(data+10, 2),

-                               printBits(2, data+10)
+                               sprint_bin(data+10, 2)

                );
                );

+

        PrintAndLog("OneTimePad : %s - %s\n",
                                sprint_hex(data + 12, 4),
        PrintAndLog("OneTimePad : %s - %s\n",
                                sprint_hex(data + 12, 4),

-                               printBits(4, data+12)
+                               sprint_bin(data+12, 4)

                );
                );

+

        return 0;
 }
 
        return 0;
 }
 

-static int ntag_print_CC(uint8_t *data) {
-
-       PrintAndLog("\n--- NTAG NDEF Message");
-
-       if(data[0] != 0xe1) {
-               PrintAndLog("no NDEF message");
-               return -1;              // no NDEF message
-       }
+static int ndef_print_CC(uint8_t *data) {
+       // no NDEF message
+       if(data[0] != 0xe1)
+               return -1;

 
 

+       PrintAndLog("--- NDEF Message");

        PrintAndLog("Capability Container: %s", sprint_hex(data,4) );
        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: %d bytes", data[2], (data[2] + 1) * 8);
-       if ( data[2] == 0x12 )
-               PrintAndLog("  %02X: NDEF Memory Size: %d bytes", data[2], 144);
+       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: %d bytes", data[2], (data[2] + 1) * 8);
+       if ( data[2] == 0x96 )
+               PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 48);
+       else if ( data[2] == 0x12 )
+               PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 144);

        else if ( data[2] == 0x3e )
        else if ( data[2] == 0x3e )

-               PrintAndLog("  %02X: NDEF Memory Size: %d bytes", data[2], 496);
+               PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 496);

        else if ( data[2] == 0x6d )
        else if ( data[2] == 0x6d )

-               PrintAndLog("  %02X: NDEF Memory Size: %d bytes", data[2], 872);
-       
-       PrintAndLog("  %02X: %s / %s", data[3], 
+               PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 872);
+
+       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;
 }
 
                                (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;
 }
 

-int ul_print_type(uint16_t tagtype, uint8_t spaces){
+int ul_print_type(uint32_t tagtype, uint8_t spaces){

        char spc[11] = "          ";
        spc[10]=0x00;
        char *spacer = spc + (10-spaces);
 
        if ( tagtype & UL )     
        char spc[11] = "          ";
        spc[10]=0x00;
        char *spacer = spc + (10-spaces);
 
        if ( tagtype & UL )     

-               PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype);
+               PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

        else if ( tagtype & UL_C)
        else if ( tagtype & UL_C)

-               PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype );
+               PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

        else if ( tagtype & UL_EV1_48)
                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
        else if ( tagtype & UL_EV1_48)
                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 

-       else if ( tagtype & UL_EV1_128)
+       else if ( tagtype & UL_EV1_128) 

                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);

+       else if ( tagtype & NTAG )
+               PrintAndLog("%sTYPE : NTAG UNKNOWN", spacer);
+       else if ( tagtype & NTAG_203 )
+               PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
+       else if ( tagtype & NTAG_210 )
+               PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+       else if ( tagtype & NTAG_212 )
+               PrintAndLog("%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);

        else if ( tagtype & NTAG_213 )
        else if ( tagtype & NTAG_213 )

-               PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);

        else if ( tagtype & NTAG_215 )
        else if ( tagtype & NTAG_215 )

-               PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);

        else if ( tagtype & NTAG_216 )
        else if ( tagtype & NTAG_216 )

-               PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+       else if ( tagtype & NTAG_I2C_1K )
+               PrintAndLog("%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
+       else if ( tagtype & NTAG_I2C_2K )       
+               PrintAndLog("%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");

        else if ( tagtype & MY_D )
        else if ( tagtype & MY_D )

-               PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 (SLE 66RxxS)", spacer);

        else if ( tagtype & MY_D_NFC )
        else if ( tagtype & MY_D_NFC )

-               PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC (SLE 66RxxP)", spacer);

        else if ( tagtype & MY_D_MOVE )
        else if ( tagtype & MY_D_MOVE )

-               PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move (SLE 66R01P)", spacer);

        else if ( tagtype & MY_D_MOVE_NFC )
        else if ( tagtype & MY_D_MOVE_NFC )

-               PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC (SLE 66R01P)", spacer);
+       else if ( tagtype & MY_D_MOVE_LEAN )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
+       else if ( tagtype & FUDAN_UL )
+               PrintAndLog("%sTYPE : FUDAN Ultralight Compatible (or other compatible) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );

        else
        else

-               PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);
+               PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype);

        return 0;
 }
 
 static int ulc_print_3deskey( uint8_t *data){
        return 0;
 }
 
 static int ulc_print_3deskey( uint8_t *data){

-       PrintAndLog("         deskey1 [44/0x2C]: %s [%.4s]", sprint_hex(data   ,4),data);
-       PrintAndLog("         deskey1 [45/0x2D]: %s [%.4s]", sprint_hex(data+4 ,4),data+4);
-       PrintAndLog("         deskey2 [46/0x2E]: %s [%.4s]", sprint_hex(data+8 ,4),data+8);
-       PrintAndLog("         deskey2 [47/0x2F]: %s [%.4s]", sprint_hex(data+12,4),data+12);
+       PrintAndLog("         deskey1 [44/0x2C] : %s [%.4s]", sprint_hex(data   ,4),data);
+       PrintAndLog("         deskey1 [45/0x2D] : %s [%.4s]", sprint_hex(data+4 ,4),data+4);
+       PrintAndLog("         deskey2 [46/0x2E] : %s [%.4s]", sprint_hex(data+8 ,4),data+8);
+       PrintAndLog("         deskey2 [47/0x2F] : %s [%.4s]", sprint_hex(data+12,4),data+12);

        PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
        return 0;
 }
        PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
        return 0;
 }


@@ -358,71 +496,81 @@ static int ulc_print_3deskey( uint8_t *data){
 static int ulc_print_configuration( uint8_t *data){
 
        PrintAndLog("--- UL-C Configuration");
 static int ulc_print_configuration( uint8_t *data){
 
        PrintAndLog("--- UL-C Configuration");

-       PrintAndLog(" Higher Lockbits [40/0x28]: %s - %s", sprint_hex(data, 4), printBits(2, data));
-       PrintAndLog("         Counter [41/0x29]: %s - %s", sprint_hex(data+4, 4), printBits(2, data+4));
+       PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
+       PrintAndLog("         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2));

 
        bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
        if ( validAuth )
 
        bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
        if ( validAuth )

-               PrintAndLog("           Auth0 [42/0x2A]: %s Page %d and above need authentication", sprint_hex(data+8, 4), data[8] );
+               PrintAndLog("           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );

        else{
                if ( data[8] == 0){
        else{
                if ( data[8] == 0){

-                       PrintAndLog("           Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );
+                       PrintAndLog("           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );

                } else {
                } else {

-                       PrintAndLog("           Auth0 [42/0x2A]: %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+                       PrintAndLog("           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );

                }
        }
                }
        }

-       PrintAndLog("           Auth1 [43/0x2B]: %s %s",
+       PrintAndLog("           Auth1 [43/0x2B] : %s %s",

                        sprint_hex(data+12, 4),
                        (data[12] & 1) ? "write access restricted": "read and write access restricted"
                        );
        return 0;
 }
 
                        sprint_hex(data+12, 4),
                        (data[12] & 1) ? "write access restricted": "read and write access restricted"
                        );
        return 0;
 }
 

-static int ulev1_print_configuration( uint8_t *data){
+static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){

 
 

-       PrintAndLog("\n--- UL-EV1 Configuration");
+       PrintAndLog("\n--- Tag Configuration");

 
        bool strg_mod_en = (data[0] & 2);
        uint8_t authlim = (data[4] & 0x07);
 
        bool strg_mod_en = (data[0] & 2);
        uint8_t authlim = (data[4] & 0x07);

+       bool nfc_cnf_en = (data[4] & 0x08);
+       bool nfc_cnf_prot_pwd = (data[4] & 0x10);

        bool cfglck = (data[4] & 0x40);
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];
 
        bool cfglck = (data[4] & 0x40);
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];
 

-       PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));
+       PrintAndLog("  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));

        if ( data[3] < 0xff )
                PrintAndLog("                    - page %d and above need authentication",data[3]);
        else 
                PrintAndLog("                    - pages don't need authentication");
        PrintAndLog("                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
        if ( data[3] < 0xff )
                PrintAndLog("                    - page %d and above need authentication",data[3]);
        else 
                PrintAndLog("                    - pages don't need authentication");
        PrintAndLog("                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");

-       PrintAndLog(" cfg1 [17/0x11]: %s", sprint_hex(data+4, 4) );
+       PrintAndLog("  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );

        if ( authlim == 0)
                PrintAndLog("                    - Unlimited password attempts");
        else
                PrintAndLog("                    - Max number of password attempts is %d", authlim);
        if ( authlim == 0)
                PrintAndLog("                    - Unlimited password attempts");
        else
                PrintAndLog("                    - Max number of password attempts is %d", authlim);

+       
+       PrintAndLog("                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
+       PrintAndLog("                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
+       

        PrintAndLog("                    - user configuration %s", cfglck ? "permanently locked":"writeable");
        PrintAndLog("                    - %s access is protected with password", prot ? "read and write":"write");
        PrintAndLog("                    - user configuration %s", cfglck ? "permanently locked":"writeable");
        PrintAndLog("                    - %s access is protected with password", prot ? "read and write":"write");

-       PrintAndLog("               %02X - Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
-       PrintAndLog(" PWD  [18/0x12]: %s", sprint_hex(data+8, 4));
-       PrintAndLog(" PACK [19/0x13]: %s", sprint_hex(data+12, 4));
+       PrintAndLog("                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
+       PrintAndLog("  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
+       PrintAndLog("  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
+       PrintAndLog("  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));

        return 0;
 }
 
 static int ulev1_print_counters(){
        return 0;
 }
 
 static int ulev1_print_counters(){

-       PrintAndLog("--- UL-EV1 Counters");
+       PrintAndLog("--- Tag Counters");

        uint8_t tear[1] = {0};
        uint8_t counter[3] = {0,0,0};
        uint8_t tear[1] = {0};
        uint8_t counter[3] = {0,0,0};

+       uint16_t len = 0;

        for ( uint8_t i = 0; i<3; ++i) {
                ulev1_readTearing(i,tear,sizeof(tear));
        for ( uint8_t i = 0; i<3; ++i) {
                ulev1_readTearing(i,tear,sizeof(tear));

-               ulev1_readCounter(i,counter, sizeof(counter) );
-               PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
-               PrintAndLog("                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+               len = ulev1_readCounter(i,counter, sizeof(counter) );
+               if (len == 3) {
+                       PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
+                       PrintAndLog("                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+               }

        }
        }

-       return 0;
+       return len;

 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){

-       PrintAndLog("\n--- UL-EV1 Signature");  
-       PrintAndLog("IC signature public key name  : NXP NTAG21x 2013");
+       PrintAndLog("\n--- Tag Signature");     
+       //PrintAndLog("IC signature public key name  : NXP NTAG21x 2013"); // don't know if there is other NXP public keys.. :(

        PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
        PrintAndLog("    Elliptic curve parameters : secp128r1");
        PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));
        PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
        PrintAndLog("    Elliptic curve parameters : secp128r1");
        PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));


@@ -432,11 +580,11 @@ static int ulev1_print_signature( uint8_t *data, uint8_t len){
 }
 
 static int ulev1_print_version(uint8_t *data){
 }
 
 static int ulev1_print_version(uint8_t *data){

-       PrintAndLog("\n--- UL-EV1 / NTAG Version");
-       PrintAndLog("       Raw bytes : %s", sprint_hex(data, 8) );
-       PrintAndLog("       Vendor ID : %02X, Manufacturer: %s", data[1], getTagInfo(data[1]));
+       PrintAndLog("\n--- Tag Version");
+       PrintAndLog("       Raw bytes : %s",sprint_hex(data, 8) );
+       PrintAndLog("       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));

        PrintAndLog("    Product type : %s", getProductTypeStr(data[2]));
        PrintAndLog("    Product type : %s", getProductTypeStr(data[2]));

-       PrintAndLog(" Product subtype : %02X %s", data[3], (data[3]==1) ?"17 pF":"50pF");
+       PrintAndLog(" Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");

        PrintAndLog("   Major version : %02X", data[4]);
        PrintAndLog("   Minor version : %02X", data[5]);
        PrintAndLog("            Size : %s", getUlev1CardSizeStr(data[6]));
        PrintAndLog("   Major version : %02X", data[4]);
        PrintAndLog("   Minor version : %02X", data[5]);
        PrintAndLog("            Size : %s", getUlev1CardSizeStr(data[6]));


@@ -457,9 +605,7 @@ static int ulc_magic_test(){
        uint8_t nonce1[11] = {0x00};
        uint8_t nonce2[11] = {0x00};
        int status = ul_select(&card);
        uint8_t nonce1[11] = {0x00};
        uint8_t nonce2[11] = {0x00};
        int status = ul_select(&card);

-       if ( status < 1 ){
-               PrintAndLog("Error: couldn't select ulc_magic_test");
-               ul_switch_off_field();
+       if ( !status ){

                return UL_ERROR;
        }
        status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
                return UL_ERROR;
        }
        status = ulc_requestAuthentication(nonce1, sizeof(nonce1));


@@ -479,20 +625,16 @@ static int ul_magic_test(){
        // 1) take present UID, and try to write it back. OBSOLETE 
        // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
        iso14a_card_select_t card;
        // 1) take present UID, and try to write it back. OBSOLETE 
        // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
        iso14a_card_select_t card;

-       int status = ul_select(&card);
-       if ( status < 1 ){
-               PrintAndLog("iso14443a card select failed");
-               ul_switch_off_field();
+       if ( !ul_select(&card) ) 

                return UL_ERROR;
                return UL_ERROR;

-       }
-       status = ul_comp_write(0, NULL, 0);
+       int status = ul_comp_write(0, NULL, 0);

        ul_switch_off_field();
        if ( status == 0 ) 
        ul_switch_off_field();
        if ( status == 0 ) 

-               return UL_MAGIC;
-       return UL;
+               return MAGIC;
+       return 0;

 }
 
 }
 

-uint16_t GetHF14AMfU_Type(void){
+uint32_t GetHF14AMfU_Type(void){

 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;
 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;


@@ -500,12 +642,8 @@ uint16_t GetHF14AMfU_Type(void){
        int status = 0;
        int len;
 
        int status = 0;
        int len;
 

-       status = ul_select(&card);
-       if ( status < 1 ){
-               PrintAndLog("iso14443a card select failed");
-               ul_switch_off_field();
-               return UL_ERROR;
-       }
+       if (!ul_select(&card)) return UL_ERROR;
+

        // Ultralight - ATQA / SAK 
        if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
                PrintAndLog("Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
        // Ultralight - ATQA / SAK 
        if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
                PrintAndLog("Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);


@@ -525,12 +663,20 @@ uint16_t GetHF14AMfU_Type(void){
                                        tagtype = UL_EV1_48;
                                else if ( version[2] == 0x03 && version[6] != 0x0B )
                                        tagtype = UL_EV1_128;
                                        tagtype = UL_EV1_48;
                                else if ( version[2] == 0x03 && version[6] != 0x0B )
                                        tagtype = UL_EV1_128;

-                               else if ( version[2] == 0x04 && version[6] == 0x0F )
+                               else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0B )
+                                       tagtype = NTAG_210;
+                               else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0E )
+                                       tagtype = NTAG_212;
+                               else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x0F )

                                        tagtype = NTAG_213;
                                        tagtype = NTAG_213;

-                               else if ( version[2] == 0x04 && version[6] == 0x11 )
+                               else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x11 )

                                        tagtype = NTAG_215;
                                        tagtype = NTAG_215;

-                               else if ( version[2] == 0x04 && version[6] == 0x13 )
+                               else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 )

                                        tagtype = NTAG_216;
                                        tagtype = NTAG_216;

+                               else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x13 )
+                                       tagtype = NTAG_I2C_1K;
+                               else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x15 )
+                                       tagtype = NTAG_I2C_2K;

                                else if ( version[2] == 0x04 )
                                        tagtype = NTAG;
 
                                else if ( version[2] == 0x04 )
                                        tagtype = NTAG;
 


@@ -538,36 +684,59 @@ uint16_t GetHF14AMfU_Type(void){
                        }
                        case 0x01: tagtype = UL_C; break;
                        case 0x00: tagtype = UL; break;
                        }
                        case 0x01: tagtype = UL_C; break;
                        case 0x00: tagtype = UL; break;

-                       case -1  : tagtype = (UL | UL_C); break;  //when does this happen?
+                       case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags

                        default  : tagtype = UNKNOWN; break;
                }
                        default  : tagtype = UNKNOWN; break;
                }

-               // UL-C test
-               if (tagtype == (UL | UL_C)) {
-                       status = ul_select(&card);
-                       if ( status < 1 ){
-                               PrintAndLog("iso14443a card select failed (UL-C)");
-                               ul_switch_off_field();
-                               return UL_ERROR;
-                       }
+               // UL vs UL-C vs ntag203 test
+               if (tagtype & (UL | UL_C | NTAG_203)) {
+                       if ( !ul_select(&card) ) return UL_ERROR;
+
+                       // do UL_C check first...

                        uint8_t nonce[11] = {0x00};
                        status = ulc_requestAuthentication(nonce, sizeof(nonce));
                        uint8_t nonce[11] = {0x00};
                        status = ulc_requestAuthentication(nonce, sizeof(nonce));

-                       tagtype = ( status > 0 ) ? UL_C : UL;
-
+                       ul_switch_off_field();
+                       if (status > 1) {
+                               tagtype = UL_C;
+                       } else { 
+                               // need to re-select after authentication error
+                               if ( !ul_select(&card) ) return UL_ERROR;
+
+                               uint8_t data[16] = {0x00};
+                               // read page 0x26-0x29 (last valid ntag203 page)
+                               status = ul_read(0x26, data, sizeof(data));
+                               if ( status <= 1 ) {
+                                       tagtype = UL;
+                               } else {
+                                       // read page 0x30 (should error if it is a ntag203)
+                                       status = ul_read(0x30, data, sizeof(data));
+                                       if ( status <= 1 ){
+                                               tagtype = NTAG_203;
+                                       } else {
+                                               tagtype = UNKNOWN;
+                                       }
+                               }
+                               ul_switch_off_field();
+                       }
+               }
+               if (tagtype & UL) {
+                       tagtype = ul_fudan_check(); 

                        ul_switch_off_field();
                }
        } else {
                        ul_switch_off_field();
                }
        } else {

+               ul_switch_off_field();

                // Infinition MY-D tests   Exam high nibble 
                uint8_t nib = (card.uid[1] & 0xf0) >> 4;
                switch ( nib ){
                // Infinition MY-D tests   Exam high nibble 
                uint8_t nib = (card.uid[1] & 0xf0) >> 4;
                switch ( nib ){

-                       case 1: tagtype =  MY_D; break;
-                       case 2: tagtype = (MY_D | MY_D_NFC); break;
-                       case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break;
+                       // case 0: tagtype =  SLE66R35E7; break; //or SLE 66R35E7 - mifare compat... should have different sak/atqa for mf 1k
+                       case 1: tagtype =  MY_D; break; //or SLE 66RxxS ... up to 512 pages of 8 user bytes...
+                       case 2: tagtype = (MY_D_NFC); break; //or SLE 66RxxP ... up to 512 pages of 8 user bytes... (or in nfc mode FF pages of 4 bytes)
+                       case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; //or SLE 66R01P // 38 pages of 4 bytes //notice: we can not currently distinguish between these two
+                       case 7: tagtype =  MY_D_MOVE_LEAN; break; //or SLE 66R01L  // 16 pages of 4 bytes

                }
        }
 
                }
        }
 

-       tagtype = (ul_magic_test() == UL_MAGIC) ? (tagtype | MAGIC) : tagtype;
-       //if ((tagtype & UL)) tagtype = ul_magic_test();
-
+       tagtype |= ul_magic_test();
+       if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);

        return tagtype;
 }
 
        return tagtype;
 }
 


@@ -576,15 +745,20 @@ int CmdHF14AMfUInfo(const char *Cmd){
        uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;

-       uint8_t *key;

        int status;
        bool errors = false;
        bool hasAuthKey = false;
        int status;
        bool errors = false;
        bool hasAuthKey = false;

+       bool locked = false;
+       bool swapEndian = false;

        uint8_t cmdp = 0;
        uint8_t cmdp = 0;

-       uint8_t datalen = 0;
+       uint8_t dataLen = 0;

        uint8_t authenticationkey[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};

+       uint8_t *authkeyptr = authenticationkey;
+       uint8_t pwd[4] = {0,0,0,0};
+       uint8_t *key = pwd;

        uint8_t pack[4] = {0,0,0,0};
        uint8_t pack[4] = {0,0,0,0};

-       int len=0;
+       int len = 0;
+       char tempStr[50];

 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {


@@ -595,23 +769,21 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        return usage_hf_mfu_info();
                case 'k':
                case 'K':
                        return usage_hf_mfu_info();
                case 'k':
                case 'K':

-                       // EV1/NTAG size key
-                       datalen = param_gethex(Cmd, cmdp+1, data, 8);
-                       if ( !datalen ) {
-                               memcpy(authenticationkey, data, 4);
-                               cmdp += 2;
-                               hasAuthKey = true;
-                               break;
-                       }
-                       // UL-C size key        
-                       datalen = param_gethex(Cmd, cmdp+1, data, 32);
-                       if (!datalen){
-                               memcpy(authenticationkey, data, 16);
-                               cmdp += 2;
-                               hasAuthKey = true;
-                               break;
+                       dataLen = param_getstr(Cmd, cmdp+1, tempStr);
+                       if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                               errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                               dataLen /= 2; // handled as bytes from now on
+                       } else {
+                               PrintAndLog("\nERROR: Key is incorrect length\n");
+                               errors = true;

                        }
                        }

-                       errors = true; 
+                       cmdp += 2;
+                       hasAuthKey = true;
+                       break;
+               case 'l':
+               case 'L':
+                       swapEndian = true;
+                       cmdp++;

                        break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                        break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));


@@ -623,7 +795,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
        //Validations
        if(errors) return usage_hf_mfu_info();
 
        //Validations
        if(errors) return usage_hf_mfu_info();

-       
+

        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 


@@ -631,268 +803,417 @@ int CmdHF14AMfUInfo(const char *Cmd){
        PrintAndLog("-------------------------------------------------------------");
        ul_print_type(tagtype, 6);
 
        PrintAndLog("-------------------------------------------------------------");
        ul_print_type(tagtype, 6);
 

-       status = ul_select(&card);
-       if ( status < 1 ){
-               PrintAndLog("iso14443a card select failed");
-               ul_switch_off_field();
-               return status;
-       }
-
-       if ( hasAuthKey ) {
-               if ((tagtype & UL_C)) {
-                       //will select card automatically
-                       if (ulc_authentication(authenticationkey, false) != 0) {
-                               ul_switch_off_field();
-                               PrintAndLog("Error: Authentication Failed UL-C");
-                               return 0;
-                       }
-               } else {
-                       len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
-                       if (len < 1) {
-                               ul_switch_off_field();
-                               PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
-                               return 0;
-                       }
-               }
-       }
+       // Swap endianness 
+       if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );

 
 

+       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

 
 

-       // read pages 0,1,2,4 (should read 4pages)
+       // read pages 0,1,2,3 (should read 4pages)

        status = ul_read(0, data, sizeof(data));
        status = ul_read(0, data, sizeof(data));

-       if ( status == -1 ){
+       if ( status == -1 ) {

                ul_switch_off_field();
                PrintAndLog("Error: tag didn't answer to READ");
                return status;
                ul_switch_off_field();
                PrintAndLog("Error: tag didn't answer to READ");
                return status;

+       } else if (status == 16) {
+               ul_print_default(data);
+               ndef_print_CC(data+12);
+       } else {
+               locked = true;

        }
 
        }
 

-       ul_print_default(data);
-
-       if ((tagtype & UL_C)){
+       // UL_C Specific
+       if ((tagtype & UL_C)) {

 
                // read pages 0x28, 0x29, 0x2A, 0x2B
                uint8_t ulc_conf[16] = {0x00};
                status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to READ UL-C");
 
                // read pages 0x28, 0x29, 0x2A, 0x2B
                uint8_t ulc_conf[16] = {0x00};
                status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to READ UL-C");

+                       ul_switch_off_field();

                        return status;
                } 
                        return status;
                } 

-               ulc_print_configuration(ulc_conf);
-
-               if ((tagtype & MAGIC)){
+               if (status == 16) ulc_print_configuration(ulc_conf);
+               else locked = true;

 
 

+               if ((tagtype & MAGIC)) {
+                       //just read key

                        uint8_t ulc_deskey[16] = {0x00};
                        status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
                        uint8_t ulc_deskey[16] = {0x00};
                        status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));

-                       if ( status == -1 ){
+                       if ( status == -1 ) {

                                ul_switch_off_field();
                                PrintAndLog("Error: tag didn't answer to READ magic");
                                return status;
                        }
                                ul_switch_off_field();
                                PrintAndLog("Error: tag didn't answer to READ magic");
                                return status;
                        }

-                       ulc_print_3deskey(ulc_deskey);
+                       if (status == 16) ulc_print_3deskey(ulc_deskey);

 
                } else {
 
                } else {

+                       ul_switch_off_field();

                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
 
                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
 

+                       // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys

                        PrintAndLog("Trying some default 3des keys");
                        PrintAndLog("Trying some default 3des keys");

-                       for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
+                       for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {

                                key = default_3des_keys[i];
                                key = default_3des_keys[i];

-                               if (ulc_authentication(key, true) == 0){
-                                       PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
+                               if (ulc_authentication(key, true)) {
+                                       PrintAndLog("Found default 3des key: ");

                                        uint8_t keySwap[16];
                                        memcpy(keySwap, SwapEndian64(key,16,8), 16);
                                        ulc_print_3deskey(keySwap);
                                        uint8_t keySwap[16];
                                        memcpy(keySwap, SwapEndian64(key,16,8), 16);
                                        ulc_print_3deskey(keySwap);

-                                       ul_switch_off_field();

                                        return 1;
                                } 
                        }
                                        return 1;
                                } 
                        }

-                       ul_switch_off_field();
-                       return 1; //return even if key not found (UL_C is done)
+                       return 1;

                }
        }
 
                }
        }
 

+       // do counters and signature first (don't neet auth) 
+
+       // ul counters are different than ntag counters

        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {

-               //do counters and signature first (don't neet auth)
-               ulev1_print_counters();
+               if (ulev1_print_counters() != 3) {
+                       // failed - re-select
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+               }
+       }

 
 

+       // Read signature
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K     ))) {

                uint8_t ulev1_signature[32] = {0x00};
                status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
                uint8_t ulev1_signature[32] = {0x00};
                status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));

-               if ( status == -1 ){
+               if ( status == -1 ) {

                        PrintAndLog("Error: tag didn't answer to READ SIGNATURE");
                        ul_switch_off_field();
                        return status;
                        PrintAndLog("Error: tag didn't answer to READ SIGNATURE");
                        ul_switch_off_field();
                        return status;

-               }               
-               ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
-
-               uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x25;
-               uint8_t ulev1_conf[16] = {0x00};
-               status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
-               if ( status == -1 ){
-                       PrintAndLog("Error: tag didn't answer to READ EV1");
-                       ul_switch_off_field();
-                       return status;

                }
                }

-               // save AUTHENTICATION LIMITS for later:
-               authlim = (ulev1_conf[4] & 0x07);
-               bool allZeros = true;
-               for (uint8_t idx=0; idx<8; idx++)
-                       if (ulev1_conf[idx]) allZeros = false;
-
-               if (allZeros) authlim=7;
-               ulev1_print_configuration(ulev1_conf);
+               if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+               else {
+                       // re-select
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+               }

        }
 
        }
 

-       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
-
+       // Get Version
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_210 | NTAG_212 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K))) {

                uint8_t version[10] = {0x00};
                status  = ulev1_getVersion(version, sizeof(version));
                uint8_t version[10] = {0x00};
                status  = ulev1_getVersion(version, sizeof(version));

-               if ( status == -1 ){
+               if ( status == -1 ) {

                        PrintAndLog("Error: tag didn't answer to GETVERSION");
                        ul_switch_off_field();
                        return status;
                        PrintAndLog("Error: tag didn't answer to GETVERSION");
                        ul_switch_off_field();
                        return status;

+               } else if (status == 10) {
+                       ulev1_print_version(version);
+               } else {
+                       locked = true;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

                }
                }

-               ulev1_print_version(version);

 
 

-               // if we called info with key, just return 
-               if ( hasAuthKey ) {
-                       ul_switch_off_field();
-                       return 1;
+               uint8_t startconfigblock = 0;
+               uint8_t ulev1_conf[16] = {0x00};
+               // config blocks always are last 4 pages
+               for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
+                       if (tagtype & UL_TYPES_ARRAY[idx])
+                               startconfigblock = UL_MEMORY_ARRAY[idx]-3;
+
+               if (startconfigblock){ // if we know where the config block is...
+                       status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
+                       if ( status == -1 ) {
+                               PrintAndLog("Error: tag didn't answer to READ EV1");
+                               ul_switch_off_field();
+                               return status;
+                       } else if (status == 16) {
+                               // save AUTHENTICATION LIMITS for later:
+                               authlim = (ulev1_conf[4] & 0x07);
+                               ulev1_print_configuration(ulev1_conf, startconfigblock);
+                       }

                }
 
                // AUTHLIMIT, (number of failed authentications)
                // 0 = limitless.
                }
 
                // AUTHLIMIT, (number of failed authentications)
                // 0 = limitless.

-               // 1-7 = ...  should we even try then?
-               if ( authlim == 0 ){
+               // 1-7 = limit. No automatic tries then.
+               // hasAuthKey,  if we was called with key, skip test.
+               if ( !authlim && !hasAuthKey ) {

                        PrintAndLog("\n--- Known EV1/NTAG passwords.");
                        PrintAndLog("\n--- Known EV1/NTAG passwords.");

+                       len = 0;
+                       
+                       // test pwd gen A
+                       num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+                       
+                       // test pwd gen B
+                       num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

 
 

-                       for (uint8_t i = 0; i < 3; ++i ){
+                       // test pwd gen C
+                       num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;                    
+                       
+                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {

                                key = default_pwd_pack[i];
                                key = default_pwd_pack[i];

-                               if ( len > -1 ){
-                                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
-                                       if (len == 1) {
-                                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
-                                               break;
-                                       }
+                               len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                               if (len >= 1) {
+                                       PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                                       break;
+                               } else {
+                                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

                                }
                        }
                                }
                        }

+                       if (len < 1) PrintAndLog("password not known");

                }
        }
 
                }
        }
 

-       if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
-
-               uint8_t cc[16] = {0x00};
-               status = ul_read(3, cc, sizeof(cc));
-               if ( status == -1 ){
-                       PrintAndLog("Error: tag didn't answer to READ ntag");
-                       return status;
-               }
-               ntag_print_CC(cc);
-       }
-       

        ul_switch_off_field();
        ul_switch_off_field();

+       if (locked) PrintAndLog("\nTag appears to be locked, try using the key to get more info");

        PrintAndLog("");
        return 1;
 }
 
 //
        PrintAndLog("");
        return 1;
 }
 
 //

-//  Mifare Ultralight Write Single Block
+//  Write Single Block

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

-       uint8_t blockNo    = -1;
-       bool chinese_card  = FALSE;
-       uint8_t bldata[16] = {0x00};
-       UsbCommand resp;

 
 

-       char cmdp = param_getchar(Cmd, 0);
-       if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  hf mfu wrbl <block number> <block data (8 hex symbols)> [w]");
-               PrintAndLog("       [block number]");
-               PrintAndLog("       [block data] - (8 hex symbols)");
-               PrintAndLog("       [w] - Chinese magic ultralight tag");
-               PrintAndLog("");
-               PrintAndLog("        sample: hf mfu wrbl 0 01020304");
-               PrintAndLog("");                
-               return 0;
-       }       
-       
-       blockNo = param_get8(Cmd, 0);
+       int blockNo = -1;       
+       bool errors = false;
+       bool hasAuthKey = false;
+       bool hasPwdKey = false;
+       bool swapEndian = false;

 
 

-       if (blockNo > MAX_UL_BLOCKS){
-               PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
-               return 1;
+       uint8_t cmdp = 0;
+       uint8_t keylen = 0;
+       uint8_t blockdata[20] = {0x00};
+       uint8_t data[16] = {0x00};
+       uint8_t authenticationkey[16] = {0x00};
+       uint8_t *authKeyPtr = authenticationkey;
+
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+                       case 'h':
+                       case 'H':
+                               return usage_hf_mfu_wrbl();
+                       case 'k':
+                       case 'K':
+                               // EV1/NTAG size key
+                               keylen = param_gethex(Cmd, cmdp+1, data, 8);
+                               if ( !keylen ) {
+                                       memcpy(authenticationkey, data, 4);
+                                       cmdp += 2;
+                                       hasPwdKey = true;
+                                       break;
+                               }
+                               // UL-C size key        
+                               keylen = param_gethex(Cmd, cmdp+1, data, 32);
+                               if (!keylen){
+                                       memcpy(authenticationkey, data, 16);
+                                       cmdp += 2;
+                                       hasAuthKey = true;
+                                       break;
+                               }
+                               PrintAndLog("\nERROR: Key is incorrect length\n");
+                               errors = true; 
+                               break;
+                       case 'b':
+                       case 'B':
+                               blockNo = param_get8(Cmd, cmdp+1);
+                               if (blockNo < 0) {
+                                       PrintAndLog("Wrong block number");
+                                       errors = true;                                                                  
+                               }
+                               cmdp += 2;
+                               break;
+                       case 'l':
+                       case 'L':
+                               swapEndian = true;
+                               cmdp++; 
+                               break;
+                       case 'd':
+                       case 'D':
+                               if ( param_gethex(Cmd, cmdp+1, blockdata, 8) ) {
+                                       PrintAndLog("Block data must include 8 HEX symbols");
+                                       errors = true;
+                                       break;
+                               }
+                               cmdp += 2;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = true;
+                               break;
+               }
+               //Validations
+               if(errors) return usage_hf_mfu_wrbl();

        }
        }

-       
-       if (param_gethex(Cmd, 1, bldata, 8)) {
-               PrintAndLog("Block data must include 8 HEX symbols");
-               return 1;
+
+       if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
+       // starting with getting tagtype
+       TagTypeUL_t tagtype = GetHF14AMfU_Type();
+       if (tagtype == UL_ERROR) return -1;
+
+       uint8_t maxblockno = 0;
+       for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+               if (tagtype & UL_TYPES_ARRAY[idx])
+                       maxblockno = UL_MEMORY_ARRAY[idx];
+       }
+       if (blockNo > maxblockno){
+               PrintAndLog("block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+               return usage_hf_mfu_wrbl();

        }
        }

+
+       // Swap endianness 
+       if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
+       if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
+
+       if ( blockNo <= 3)              
+               PrintAndLog("Special Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));
+       else
+               PrintAndLog("Block: %0d (0x%02X) [ %s]", blockNo, blockNo, sprint_hex(blockdata, 4));

        
        

-       if (strchr(Cmd,'w') != 0  || strchr(Cmd,'W') != 0 ) {
-               chinese_card = TRUE; 
+       //Send write Block
+       UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
+       memcpy(c.d.asBytes,blockdata,4);
+
+       if ( hasAuthKey ){
+               c.arg[1] = 1;
+               memcpy(c.d.asBytes+4,authKeyPtr,16);
+       }
+       else if ( hasPwdKey ) {
+               c.arg[1] = 2;
+               memcpy(c.d.asBytes+4,authKeyPtr,4);

        }
        
        }
        

-       if ( blockNo <= 3) {
-               if (!chinese_card){
-                       PrintAndLog("Access Denied");
-               } else {
-                       PrintAndLog("--specialblock no:%02x", blockNo);
-                       PrintAndLog("--data: %s", sprint_hex(bldata, 4));
-                       UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
-                       memcpy(d.d.asBytes,bldata, 4);
-                       SendCommand(&d);
-                       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-                               uint8_t isOK  = resp.arg[0] & 0xff;
-                               PrintAndLog("isOk:%02x", isOK);
-                       } else {
-                               PrintAndLog("Command execute timeout");
-                       }  
-               }
+       clearCommandBuffer();
+       SendCommand(&c);
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+               uint8_t isOK  = resp.arg[0] & 0xff;
+               PrintAndLog("isOk:%02x", isOK);

        } else {
        } else {

-               PrintAndLog("--block no:%02x", blockNo);
-               PrintAndLog("--data: %s", sprint_hex(bldata, 4));               
-               UsbCommand e = {CMD_MIFAREU_WRITEBL, {blockNo}};
-               memcpy(e.d.asBytes,bldata, 4);
-               SendCommand(&e);
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-                       uint8_t isOK  = resp.arg[0] & 0xff;
-                       PrintAndLog("isOk:%02x", isOK);
-               } else {
-                       PrintAndLog("Command execute timeout");
-               }
+               PrintAndLog("Command execute timeout");

        }
        }

+       

        return 0;
 }
        return 0;
 }

-

 //
 //

-//  Mifare Ultralight Read Single Block
+//  Read Single Block

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

-       UsbCommand resp;
-       uint8_t blockNo = -1;   
-       char cmdp = param_getchar(Cmd, 0);
-       
-       if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {    
-               PrintAndLog("Usage:  hf mfu rdbl <block number>");
-               PrintAndLog("        sample: hfu mfu rdbl 0");
-               return 0;
+       int blockNo = -1;       
+       bool errors = false;
+       bool hasAuthKey = false;
+       bool hasPwdKey = false;
+       bool swapEndian = false;
+       uint8_t cmdp = 0;
+       uint8_t keylen = 0;
+       uint8_t data[16] = {0x00};
+       uint8_t authenticationkey[16] = {0x00};
+       uint8_t *authKeyPtr = authenticationkey;
+
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+                       case 'h':
+                       case 'H':
+                               return usage_hf_mfu_rdbl();
+                       case 'k':
+                       case 'K':
+                               // EV1/NTAG size key
+                               keylen = param_gethex(Cmd, cmdp+1, data, 8);
+                               if ( !keylen ) {
+                                       memcpy(authenticationkey, data, 4);
+                                       cmdp += 2;
+                                       hasPwdKey = true;
+                                       break;
+                               }
+                               // UL-C size key        
+                               keylen = param_gethex(Cmd, cmdp+1, data, 32);
+                               if (!keylen){
+                                       memcpy(authenticationkey, data, 16);
+                                       cmdp += 2;
+                                       hasAuthKey = true;
+                                       break;
+                               }
+                               PrintAndLog("\nERROR: Key is incorrect length\n");
+                               errors = true; 
+                               break;
+                       case 'b':
+                       case 'B':
+                               blockNo = param_get8(Cmd, cmdp+1);
+                               if (blockNo < 0) {
+                                       PrintAndLog("Wrong block number");
+                                       errors = true;                                                                  
+                               }
+                               cmdp += 2;
+                               break;
+                       case 'l':
+                       case 'L':
+                               swapEndian = true;
+                               cmdp++; 
+                               break;                          
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = true;
+                               break;
+               }
+               //Validations
+               if(errors) return usage_hf_mfu_rdbl();

        }
 
        }
 

-       blockNo = param_get8(Cmd, 0);
+       if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
+       // start with getting tagtype
+       TagTypeUL_t tagtype = GetHF14AMfU_Type();
+       if (tagtype == UL_ERROR) return -1;

 
 

-       if (blockNo > MAX_UL_BLOCKS){
-               PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight");
-               return 1;
+       uint8_t maxblockno = 0;
+       for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++){
+               if (tagtype & UL_TYPES_ARRAY[idx])
+                       maxblockno = UL_MEMORY_ARRAY[idx];
+       }
+       if (blockNo > maxblockno){
+               PrintAndLog("block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+               return usage_hf_mfu_rdbl();

        }
 
        }
 

+       // Swap endianness 
+       if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
+       if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
+       
+       //Read Block

        UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
        UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};

+       if ( hasAuthKey ){
+               c.arg[1] = 1;
+               memcpy(c.d.asBytes,authKeyPtr,16);
+       }
+       else if ( hasPwdKey ) {
+               c.arg[1] = 2;
+               memcpy(c.d.asBytes,authKeyPtr,4);
+       }
+       
+       clearCommandBuffer();

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

-
-
+       UsbCommand resp;

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                uint8_t isOK = resp.arg[0] & 0xff;
                if (isOK) {
                        uint8_t *data = resp.d.asBytes;
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                uint8_t isOK = resp.arg[0] & 0xff;
                if (isOK) {
                        uint8_t *data = resp.d.asBytes;

-                       PrintAndLog("Block: %0d (0x%02X) [ %s]", (int)blockNo, blockNo, sprint_hex(data, 4));
+                       PrintAndLog("\nBlock#  | Data        | Ascii");
+                       PrintAndLog("-----------------------------");
+                       PrintAndLog("%02d/0x%02X | %s| %.4s\n", blockNo, blockNo, sprint_hex(data, 4), data);

                }
                else {
                        PrintAndLog("Failed reading block: (%02x)", isOK);
                }
                else {
                        PrintAndLog("Failed reading block: (%02x)", isOK);


@@ -900,58 +1221,162 @@ int CmdHF14AMfURdBl(const char *Cmd){
        } else {
                PrintAndLog("Command execute time-out");
        }
        } else {
                PrintAndLog("Command execute time-out");
        }

-

        return 0;
 }
 
        return 0;
 }
 

-int usage_hf_mfu_info(void)
-{
+int usage_hf_mfu_info(void) {

        PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
        PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
        PrintAndLog("The following tags can be identified:\n");
        PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
        PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
        PrintAndLog("The following tags can be identified:\n");

-       PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1");
-       PrintAndLog("NTAG 213, NTAG 215, NTAG 216");
+       PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
+       PrintAndLog("NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");

        PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");
        PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");

-       PrintAndLog("Usage:  hf mfu info k <key>");
+       PrintAndLog("Usage:  hf mfu info k <key> l");

        PrintAndLog("  Options : ");
        PrintAndLog("  Options : ");

-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : (optional) swap entered key's endianness");

        PrintAndLog("");
        PrintAndLog("   sample : hf mfu info");
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu info");

-       PrintAndLog("          : hf mfu info k 11223344");
+       PrintAndLog("          : hf mfu info k 00112233445566778899AABBCCDDEEFF");
+       PrintAndLog("          : hf mfu info k AABBCCDDD");

        return 0;
 }
 
        return 0;
 }
 

-int usage_hf_mfu_dump(void)
-{
+int usage_hf_mfu_dump(void) {

        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");

+       PrintAndLog("NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");

        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     

-       PrintAndLog("Usage:  hf mfu dump s k <key> n <filename w/o .bin>");
-       PrintAndLog("  Options : ");
-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-       PrintAndLog("  l       : swap entered key's endianness for auth");
+       PrintAndLog("Usage:  hf mfu dump k <key> l n <filename w/o .bin> p <page#> q <#pages>");
+       PrintAndLog("  Options :");
+       PrintAndLog("  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : (optional) swap entered key's endianness");

        PrintAndLog("  n <FN > : filename w/o .bin to save the dump as");       
        PrintAndLog("  p <Pg > : starting Page number to manually set a page to start the dump at");    
        PrintAndLog("  q <qty> : number of Pages to manually set how many pages to dump");      
        PrintAndLog("  n <FN > : filename w/o .bin to save the dump as");       
        PrintAndLog("  p <Pg > : starting Page number to manually set a page to start the dump at");    
        PrintAndLog("  q <qty> : number of Pages to manually set how many pages to dump");      

-

        PrintAndLog("");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
        PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
        PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");

+       PrintAndLog("          : hf mfu dump k AABBCCDDD\n");
+       return 0;
+}
+
+int usage_hf_mfu_rdbl(void) {
+       PrintAndLog("Read a block and print. It autodetects card type.\n");     
+       PrintAndLog("Usage:  hf mfu rdbl b <block number> k <key> l\n");
+       PrintAndLog("  Options:");
+       PrintAndLog("  b <no>  : block to read");
+       PrintAndLog("  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : (optional) swap entered key's endianness");    
+       PrintAndLog("");
+       PrintAndLog("   sample : hf mfu rdbl b 0");
+       PrintAndLog("          : hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
+       PrintAndLog("          : hf mfu rdbl b 0 k AABBCCDDD\n");
+       return 0;
+}
+
+int usage_hf_mfu_wrbl(void) {
+       PrintAndLog("Write a block. It autodetects card type.\n");              
+       PrintAndLog("Usage:  hf mfu wrbl b <block number> d <data> k <key> l\n");
+       PrintAndLog("  Options:");      
+       PrintAndLog("  b <no>   : block to write");
+       PrintAndLog("  d <data> : block data - (8 hex symbols)");
+       PrintAndLog("  k <key>  : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l        : (optional) swap entered key's endianness");   
+       PrintAndLog("");
+       PrintAndLog("    sample : hf mfu wrbl b 0 d 01234567");
+       PrintAndLog("           : hf mfu wrbl b 0 d 01234567 k AABBCCDDD\n");
+       return 0;
+}
+
+int usage_hf_mfu_eload(void) {
+       PrintAndLog("It loads emul dump from the file `filename.eml`");
+       PrintAndLog("Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
+       PrintAndLog("Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
+       PrintAndLog("  Options:");
+       PrintAndLog("    h          : this help");      
+       PrintAndLog("    u          : UL (required)");
+       PrintAndLog("    [filename] : without `.eml` (required)");      
+       PrintAndLog("    numblocks  : number of blocks to load from eml file (optional)");
+       PrintAndLog("");
+       PrintAndLog("  sample: hf mfu eload u filename");
+       PrintAndLog("          hf mfu eload u filename 57");
+                       return 0;
+}
+
+int usage_hf_mfu_sim(void) {
+       PrintAndLog("\nEmulating Ultralight tag from emulator memory\n");
+       PrintAndLog("\nBe sure to load the emulator memory first!\n");
+       PrintAndLog("Usage: hf mfu sim t 7 u <uid>");
+       PrintAndLog("  Options:");
+       PrintAndLog("    h       : this help");
+       PrintAndLog("    t 7     : 7 = NTAG or Ultralight sim (required)");
+       PrintAndLog("    u <uid> : 4 or 7 byte UID (optional)");
+       PrintAndLog("\n   sample : hf mfu sim t 7");
+       PrintAndLog("          : hf mfu sim t 7 u 1122344556677\n");
+       
+       return 0;
+}
+
+int usage_hf_mfu_ucauth(void) {
+       PrintAndLog("Usage:  hf mfu cauth k <key number>");
+       PrintAndLog("      0 (default): 3DES standard key");
+       PrintAndLog("      1 : all 0x00 key");
+       PrintAndLog("      2 : 0x00-0x0F key");
+       PrintAndLog("      3 : nfc key");
+       PrintAndLog("      4 : all 0x01 key");
+       PrintAndLog("      5 : all 0xff key");
+       PrintAndLog("      6 : 0x00-0xFF key");         
+       PrintAndLog("\n      sample : hf mfu cauth k");
+       PrintAndLog("               : hf mfu cauth k 3");

        return 0;
 }
 
        return 0;
 }
 

+int usage_hf_mfu_ucsetpwd(void) {
+       PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
+       PrintAndLog("       [password] - (32 hex symbols)");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
+       PrintAndLog("");
+       return 0;
+}
+
+int usage_hf_mfu_ucsetuid(void) {
+       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("");
+       return 0;
+}
+
+int  usage_hf_mfu_gendiverse(void){
+       PrintAndLog("Usage:  hf mfu gen <uid (8 hex symbols)>");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu gen 11223344");
+       PrintAndLog("");
+       return 0;
+}
+
+int  usage_hf_mfu_pwdgen(void){
+       PrintAndLog("Usage:  hf mfu pwdgen <uid (14 hex symbols)>");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu pwdgen 11223344556677");
+       PrintAndLog("");
+       return 0;
+}
+
+#define DUMP_PREFIX_LENGTH 48 

 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
 //
 //  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_t2 = NULL;
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
        uint8_t *lockbytes_t2 = NULL;


@@ -959,14 +1384,15 @@ int CmdHF14AMfUDump(const char *Cmd){
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
        uint8_t data[1024] = {0x00};
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
        uint8_t data[1024] = {0x00};

-       bool hasPwd = false;
+       bool hasAuthKey = false;

        int i = 0;
        int Pages = 16;
        bool tmplockbit = 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 *keyPtr = key;
+       uint8_t dataLen = 0;
+       uint8_t cmdp = 0;
+       uint8_t authenticationkey[16] = {0x00};
+       memset(authenticationkey, 0x00, sizeof(authenticationkey));
+       uint8_t *authKeyPtr = authenticationkey;

        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;
        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;


@@ -984,15 +1410,15 @@ int CmdHF14AMfUDump(const char *Cmd){
                case 'k':
                case 'K':
                        dataLen = param_getstr(Cmd, cmdp+1, tempStr);
                case 'k':
                case 'K':
                        dataLen = param_getstr(Cmd, cmdp+1, tempStr);

-                       if (dataLen == 32) //ul-c
-                               errors = param_gethex(tempStr, 0, key, dataLen);
-                       else if (dataLen == 8) //ev1/ntag
-                               errors = param_gethex(tempStr, 0, key, dataLen);
-                       else
+                       if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                               errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                               dataLen /= 2;
+                       } else {
+                               PrintAndLog("\nERROR: Key is incorrect length\n");

                                errors = true;
                                errors = true;

-                               
+                       }

                        cmdp += 2;
                        cmdp += 2;

-                       hasPwd = true;
+                       hasAuthKey = true;

                        break;
                case 'l':
                case 'L':
                        break;
                case 'l':
                case 'L':


@@ -1007,7 +1433,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        cmdp += 2;
                        break;
                case 'p':
                        cmdp += 2;
                        break;
                case 'p':

-               case 'P':
+               case 'P': //set start page

                        startPage = param_get8(Cmd, cmdp+1);
                        manualPages = true;
                        cmdp += 2;
                        startPage = param_get8(Cmd, cmdp+1);
                        manualPages = true;
                        cmdp += 2;


@@ -1029,44 +1455,52 @@ int CmdHF14AMfUDump(const char *Cmd){
        //Validations
        if(errors) return usage_hf_mfu_dump();
 
        //Validations
        if(errors) return usage_hf_mfu_dump();
 

-       if (swapEndian && dataLen == 32)
-               keyPtr = SwapEndian64(data, 16, 8);
+       //if we entered a key in little endian and set the swapEndian switch - switch it...
+       if (swapEndian && hasAuthKey) 
+               authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);

 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 

-       if (!manualPages)
+       if (!manualPages) //get number of pages to read

                for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
                        if (tagtype & UL_TYPES_ARRAY[idx])
                for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
                        if (tagtype & UL_TYPES_ARRAY[idx])

-                               Pages = UL_MEMORY_ARRAY[idx]+1;
+                               Pages = UL_MEMORY_ARRAY[idx]+1; //add one as maxblks starts at 0

 
        ul_print_type(tagtype, 0);
        PrintAndLog("Reading tag memory...");
 
        ul_print_type(tagtype, 0);
        PrintAndLog("Reading tag memory...");

-
-       UsbCommand c = {CMD_MIFAREUC_READCARD, {startPage,Pages}};
-       if ( hasPwd ) {
+       UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
+       if ( hasAuthKey ) {

                if (tagtype & UL_C)
                        c.arg[2] = 1; //UL_C auth
                else
                        c.arg[2] = 2; //UL_EV1/NTAG auth
 
                if (tagtype & UL_C)
                        c.arg[2] = 1; //UL_C auth
                else
                        c.arg[2] = 2; //UL_EV1/NTAG auth
 

-               memcpy(c.d.asBytes, key, dataLen/2);
+               memcpy(c.d.asBytes, authKeyPtr, dataLen);

        }
        }

+
+       clearCommandBuffer();

        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
                PrintAndLog("Command execute time-out");
                return 1;
        }
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
                PrintAndLog("Command execute time-out");
                return 1;
        }

-       PrintAndLog     ("%u,%u",resp.arg[0],resp.arg[1]);
-       uint8_t isOK = resp.arg[0] & 0xff;
-       if (isOK) {
-               memcpy(data, resp.d.asBytes, resp.arg[1]);
-       } else {
+       if (resp.arg[0] != 1) {

                PrintAndLog("Failed reading block: (%02x)", i);
                return 1;
        }
 
                PrintAndLog("Failed reading block: (%02x)", i);
                return 1;
        }
 

+       uint32_t startindex = resp.arg[2];
+       uint32_t bufferSize = resp.arg[1];
+       if (bufferSize > sizeof(data)) {
+               PrintAndLog("Data exceeded Buffer size!");
+               bufferSize = sizeof(data);
+       }
+       GetFromBigBuf(data, bufferSize, startindex);
+       WaitForResponse(CMD_ACK,NULL);
+
+       Pages = bufferSize/4;

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


@@ -1078,7 +1512,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        }
 
        // Load bottom lockbytes if available
        }
 
        // Load bottom lockbytes if available

-       // HOW DOES THIS APPLY TO EV1 and/or NTAG???
+       // TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG

        if ( Pages == 44 ) {
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
        if ( Pages == 44 ) {
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];


@@ -1088,15 +1522,99 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
                }
        }
 

-       // add keys
-       if (hasPwd){ //UL_C
-               memcpy(data + Pages*4, key, dataLen/2);
-               Pages += 4;
-       } 
+       uint8_t get_pack[] = {0,0};
+       iso14a_card_select_t card;
+       uint8_t dump_file_data[1024+DUMP_PREFIX_LENGTH] = {0x00};
+       uint8_t get_version[] = {0,0,0,0,0,0,0,0,0};
+       uint8_t get_tearing[] = {0,0,0};
+       uint8_t get_counter[] = {0,0,0};
+       uint8_t dummy_pack[] = {0,0};
+       uint8_t get_signature[32];
+       memset( get_signature, 0, sizeof(get_signature) );
+
+       // not ul_c and not std ul then attempt to get deeper info
+       if (!(tagtype & UL_C || tagtype & UL)) {
+               //attempt to read pack
+               if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
+                       //reset pack
+                       get_pack[0]=0;
+                       get_pack[1]=0;
+               }
+               ul_switch_off_field();
+               // add pack to block read
+               memcpy(data + (Pages*4) - 4, get_pack, sizeof(get_pack));
+       if ( hasAuthKey )
+               ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+       else
+               ul_select(&card);
+
+       ulev1_getVersion( get_version, sizeof(get_version) );
+       for ( uint8_t i = 0; i<3; ++i) {
+               ulev1_readTearing(i, get_tearing+i, 1);
+               ulev1_readCounter(i, get_counter, sizeof(get_counter) );
+       }
+       ul_switch_off_field();
+       if ( hasAuthKey )
+               ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+       else
+               ul_select(&card);
+       ulev1_readSignature( get_signature, sizeof(get_signature));
+       ul_switch_off_field();
+       }
+
+       // format and add keys to block dump output
+       if (hasAuthKey) {
+               // if we didn't swapendian before - do it now for the sprint_hex call
+               // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
+               //       need to swap to keep it the same
+               if (!swapEndian){
+                       authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
+               } else {
+                       authKeyPtr = authenticationkey;
+               }

 
 

+               if (tagtype & UL_C){ //add 4 pages
+                       memcpy(data + Pages*4, authKeyPtr, dataLen);
+                       Pages += dataLen/4;  
+               } else { // 2nd page from end
+                       memcpy(data + (Pages*4) - 8, authenticationkey, dataLen);
+               }
+       }
+
+       //add *special* blocks to dump
+       //get version
+       memcpy(dump_file_data, get_version, sizeof(get_version));
+       //tearing
+       memcpy(dump_file_data+10, get_tearing, sizeof(get_tearing));
+       //pack
+       memcpy(dump_file_data+13, get_pack, sizeof(get_pack));
+       //signature
+       memcpy(dump_file_data+16, get_signature, sizeof(get_signature));
+       //add regular block read data to dump
+       memcpy(dump_file_data+DUMP_PREFIX_LENGTH, data, Pages*4);
+
+       PrintAndLog("\n*Special* block data:");
+       PrintAndLog("\nDataType| Data        |   | Ascii");
+       PrintAndLog("---------------------------------");
+       PrintAndLog("GetVer-1| %s|   | %.4s", sprint_hex(dump_file_data, 4), dump_file_data);
+       PrintAndLog("GetVer-2| %s|   | %.4s", sprint_hex(dump_file_data+4, 4), dump_file_data+4);
+       PrintAndLog("TBD     | 00 00       |   | ");
+       PrintAndLog("Tearing |    %s|   | %.3s", sprint_hex(dump_file_data+10, 3), dump_file_data+10);
+       PrintAndLog("Pack    |    %s   |   | %.2s", sprint_hex(dump_file_data+13, 2), dump_file_data+13);
+       PrintAndLog("TBD     |          00 |   | ");
+       PrintAndLog("Sig-1   | %s|   | %.4s", sprint_hex(dump_file_data+16, 4), dump_file_data+16);
+       PrintAndLog("Sig-2   | %s|   | %.4s", sprint_hex(dump_file_data+20, 4), dump_file_data+20);
+       PrintAndLog("Sig-3   | %s|   | %.4s", sprint_hex(dump_file_data+24, 4), dump_file_data+24);
+       PrintAndLog("Sig-4   | %s|   | %.4s", sprint_hex(dump_file_data+28, 4), dump_file_data+28);
+       PrintAndLog("Sig-5   | %s|   | %.4s", sprint_hex(dump_file_data+32, 4), dump_file_data+32);
+       PrintAndLog("Sig-6   | %s|   | %.4s", sprint_hex(dump_file_data+36, 4), dump_file_data+36);
+       PrintAndLog("Sig-7   | %s|   | %.4s", sprint_hex(dump_file_data+40, 4), dump_file_data+40);
+       PrintAndLog("Sig-8   | %s|   | %.4s", sprint_hex(dump_file_data+44, 4), dump_file_data+44);
+       PrintAndLog("\nBlock#  | Data        |lck| Ascii");
+       PrintAndLog("---------------------------------");

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

-                       PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
+                       PrintAndLog("%02d/0x%02X | %s|   | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), data + i * 4 );

                        continue;
                }
                switch(i){
                        continue;
                }
                switch(i){


@@ -1124,7 +1642,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 24:
                        case 25:
                        case 26:
                        case 24:
                        case 25:
                        case 26:

-                       case 27: tmplockbit = bit2[4]; break;               
+                       case 27: tmplockbit = bit2[4]; break;

                        case 28:
                        case 29:
                        case 30:
                        case 28:
                        case 29:
                        case 30:


@@ -1143,8 +1661,9 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 43: tmplockbit = bit2[9]; break;  //auth1
                        default: break;
                }
                        case 43: tmplockbit = bit2[9]; break;  //auth1
                        default: break;
                }

-               PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
-       }  
+               PrintAndLog("%02d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
+       }
+       PrintAndLog("---------------------------------");

 
        // user supplied filename?
        if (fileNlen < 1) {
 
        // user supplied filename?
        if (fileNlen < 1) {


@@ -1157,25 +1676,16 @@ int CmdHF14AMfUDump(const char *Cmd){
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);

-               return 1;       
+               return 1;

        }
        }

-       fwrite( data, 1, Pages*4, fout );
-       fclose(fout);
-       
-       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages, Pages*4, filename);
-       return 0;
-}
-
-/*
-// Needed to Authenticate to Ultralight C tags
-void rol (uint8_t *data, const size_t len){
-       uint8_t first = data[0];
-       for (size_t i = 0; i < len-1; i++) {
-               data[i] = data[i+1];
+       fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout );
+       if (fout) {
+               fclose(fout);
+               fout = NULL;

        }
        }

-       data[len-1] = first;
+       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+(DUMP_PREFIX_LENGTH/4), Pages*4 + DUMP_PREFIX_LENGTH, filename);
+       return 0;

 }
 }

-*/

 
 //-------------------------------------------------------------------------------
 // Ultralight C Methods
 
 //-------------------------------------------------------------------------------
 // Ultralight C Methods


@@ -1186,7 +1696,7 @@ void rol (uint8_t *data, const size_t len){
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 

-       uint8_t keyNo = 0;
+       uint8_t keyNo = 3;

        bool errors = false;
 
        char cmdp = param_getchar(Cmd, 0);
        bool errors = false;
 
        char cmdp = param_getchar(Cmd, 0);


@@ -1194,33 +1704,20 @@ int CmdHF14AMfucAuth(const char *Cmd){
        //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 > KEYS_3DES_COUNT) 
+               if(keyNo >= KEYS_3DES_COUNT) 

                        errors = true;
        }
 
                        errors = true;
        }
 

-       if (cmdp == 'h' || cmdp == 'H')
-               errors = true;
+       if (cmdp == 'h' || cmdp == 'H') errors = true;

        
        

-       if (errors) {
-               PrintAndLog("Usage:  hf mfu cauth k <key number>");
-               PrintAndLog("      0 (default): 3DES standard key");
-               PrintAndLog("      1 : all 0x00 key");
-               PrintAndLog("      2 : 0x00-0x0F key");
-               PrintAndLog("      3 : nfc key");
-               PrintAndLog("      4 : all 0x01 key");
-               PrintAndLog("      5 : all 0xff key");
-               PrintAndLog("      6 : 0x00-0xFF key");         
-               PrintAndLog("\n      sample : hf mfu cauth k");
-               PrintAndLog("               : hf mfu cauth k 3");
-               return 0;
-       } 
+       if (errors) return usage_hf_mfu_ucauth(); 

 
        uint8_t *key = default_3des_keys[keyNo];
 
        uint8_t *key = default_3des_keys[keyNo];

-       if (ulc_authentication(key, true) == 0)
+       if (ulc_authentication(key, true))

                PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");
                PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");

-                       
+               

        return 0;
 }
 
        return 0;
 }
 


@@ -1321,159 +1818,15 @@ int CmdTestDES(const char * cmd)
 }
 **/
 
 }
 **/
 

-//
-// Ultralight C Read Single Block
-//
-int CmdHF14AMfUCRdBl(const char *Cmd)
-{
-       UsbCommand resp;
-       bool hasPwd = FALSE;
-       uint8_t blockNo = -1;
-       uint8_t key[16];
-       char cmdp = param_getchar(Cmd, 0);
-
-       if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  hf mfu crdbl  <block number> <key>");
-               PrintAndLog("");
-               PrintAndLog("sample: hf mfu crdbl 0");
-               PrintAndLog("        hf mfu crdbl 0 00112233445566778899AABBCCDDEEFF");
-               return 0;
-       }
-
-       blockNo = param_get8(Cmd, 0);
-       if (blockNo < 0) {
-               PrintAndLog("Wrong block number");
-               return 1;
-       }
-
-       if (blockNo > MAX_ULC_BLOCKS ){
-               PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
-               return 1;
-       } 
-       
-       // key
-       if ( strlen(Cmd) > 3){
-               if (param_gethex(Cmd, 1, key, 32)) {
-                       PrintAndLog("Key must include %d HEX symbols", 32);
-                       return 1;
-               } else {
-                       hasPwd = TRUE;
-               }       
-       }       
-
-       //Read Block
-       UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
-       if ( hasPwd ) {
-               c.arg[1] = 1;
-               memcpy(c.d.asBytes,key,16);
-       }
-       SendCommand(&c);
-
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-               uint8_t isOK = resp.arg[0] & 0xff;
-               if (isOK) {
-                       uint8_t *data = resp.d.asBytes;
-                       PrintAndLog("Block: %0d (0x%02X) [ %s]", (int)blockNo, blockNo, sprint_hex(data, 4));
-               }
-               else {
-                       PrintAndLog("Failed reading block: (%02x)", isOK);
-               }
-       } else {
-               PrintAndLog("Command execute time-out");
-       }
-       return 0;
-}
-
-//
-//  Mifare Ultralight C Write Single Block
-//
-int CmdHF14AMfUCWrBl(const char *Cmd){
-       
-       uint8_t blockNo = -1;
-       bool chinese_card = FALSE;
-       uint8_t bldata[16] = {0x00};
-       UsbCommand resp;
-
-       char cmdp = param_getchar(Cmd, 0);
-       
-       if (strlen(Cmd) < 3 || cmdp == 'h' || cmdp == 'H') {    
-               PrintAndLog("Usage:  hf mfu cwrbl <block number> <block data (8 hex symbols)> [w]");
-               PrintAndLog("       [block number]");
-               PrintAndLog("       [block data] - (8 hex symbols)");
-               PrintAndLog("       [w] - Chinese magic ultralight tag");
-               PrintAndLog("");
-               PrintAndLog("        sample: hf mfu cwrbl 0 01020304");
-               PrintAndLog("");
-               return 0;
-       }
-       
-       blockNo = param_get8(Cmd, 0);
-       if (blockNo > MAX_ULC_BLOCKS ){
-               PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C Cards!");
-               return 1;
-       }
-       
-       if (param_gethex(Cmd, 1, bldata, 8)) {
-               PrintAndLog("Block data must include 8 HEX symbols");
-               return 1;
-       }
-
-       if (strchr(Cmd,'w') != 0  || strchr(Cmd,'W') != 0 ) {
-               chinese_card = TRUE; 
-       }
-
-       if ( blockNo <= 3 ) {
-               if (!chinese_card){
-                       PrintAndLog("Access Denied");  
-                       return 1;
-               } else {
-                       PrintAndLog("--Special block no: 0x%02x", blockNo);
-                       PrintAndLog("--Data: %s", sprint_hex(bldata, 4));
-                       UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
-                       memcpy(d.d.asBytes,bldata, 4);
-                       SendCommand(&d);
-                       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-                               uint8_t isOK  = resp.arg[0] & 0xff;
-                               PrintAndLog("isOk:%02x", isOK);
-                       } else {
-                               PrintAndLog("Command execute timeout");
-                               return 1;
-                       }
-               }
-       } else {
-                       PrintAndLog("--Block no : 0x%02x", blockNo);
-                       PrintAndLog("--Data: %s", sprint_hex(bldata, 4));               
-                       UsbCommand e = {CMD_MIFAREU_WRITEBL, {blockNo}};
-                       memcpy(e.d.asBytes,bldata, 4);
-                       SendCommand(&e);
-                       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-                               uint8_t isOK  = resp.arg[0] & 0xff;
-                               PrintAndLog("isOk : %02x", isOK);
-                       } else {
-                               PrintAndLog("Command execute timeout");
-                               return 1;
-                       }
-       }
-       return 0;
-}
-

 // 
 // Mifare Ultralight C - Set password
 //
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
 // 
 // Mifare Ultralight C - Set password
 //
 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);

-       
-       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
-               PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
-               PrintAndLog("       [password] - (32 hex symbols)");
-               PrintAndLog("");
-               PrintAndLog("sample: hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
-               PrintAndLog("");
-               return 0;
-       }
+
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetpwd();

        
        if (param_gethex(Cmd, 0, pwd, 32)) {
                PrintAndLog("Password must include 32 HEX symbols");
        
        if (param_gethex(Cmd, 0, pwd, 32)) {
                PrintAndLog("Password must include 32 HEX symbols");


@@ -1482,23 +1835,21 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
        
        UsbCommand c = {CMD_MIFAREUC_SETPWD};   
        memcpy( c.d.asBytes, pwd, 16);
        
        UsbCommand c = {CMD_MIFAREUC_SETPWD};   
        memcpy( c.d.asBytes, pwd, 16);

+       clearCommandBuffer();

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

-       

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {

-               if ( (resp.arg[0] & 0xff) == 1)
+               if ( (resp.arg[0] & 0xff) == 1) {

                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));
                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));

-               else{
+               } else {

                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }
                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }

-       }
-       else {
+       } else {

                PrintAndLog("command execution time out");
                return 1;
                PrintAndLog("command execution time out");
                return 1;

-       }
-       
+       }       

        return 0;
 }
 
        return 0;
 }
 


@@ -1512,16 +1863,8 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        
        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("");
-               return 0;
-       }
-       
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid();
+

        if (param_gethex(Cmd, 0, uid, 14)) {
                PrintAndLog("UID must include 14 HEX symbols");
                return 1;
        if (param_gethex(Cmd, 0, uid, 14)) {
                PrintAndLog("UID must include 14 HEX symbols");
                return 1;


@@ -1530,12 +1873,13 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        // read block2. 
        c.cmd = CMD_MIFAREU_READBL;
        c.arg[0] = 2;
        // read block2. 
        c.cmd = CMD_MIFAREU_READBL;
        c.arg[0] = 2;

+       clearCommandBuffer();

        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute timeout");
                return 2;
        }
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute timeout");
                return 2;
        }

-       
+

        // save old block2.
        uint8_t oldblock2[4] = {0x00};
        memcpy(resp.d.asBytes, oldblock2, 4);
        // save old block2.
        uint8_t oldblock2[4] = {0x00};
        memcpy(resp.d.asBytes, oldblock2, 4);


@@ -1547,18 +1891,20 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        c.d.asBytes[1] = uid[1];
        c.d.asBytes[2] = uid[2];
        c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];
        c.d.asBytes[1] = uid[1];
        c.d.asBytes[2] = uid[2];
        c.d.asBytes[3] =  0x88 ^ uid[0] ^ uid[1] ^ uid[2];

+       clearCommandBuffer();

        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute timeout");
                return 3;
        }
        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];
        // 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];

+       clearCommandBuffer();

        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
                PrintAndLog("Command execute timeout");
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
                PrintAndLog("Command execute timeout");


@@ -1571,6 +1917,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        c.d.asBytes[1] = oldblock2[1];
        c.d.asBytes[2] = oldblock2[2];
        c.d.asBytes[3] = oldblock2[3];
        c.d.asBytes[1] = oldblock2[1];
        c.d.asBytes[2] = oldblock2[2];
        c.d.asBytes[3] = oldblock2[3];

+       clearCommandBuffer();

        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
                PrintAndLog("Command execute timeout");
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
                PrintAndLog("Command execute timeout");


@@ -1581,14 +1928,19 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){

+
+       uint8_t uid[4]; 
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse();
+
+       if (param_gethex(Cmd, 0, uid, 8)) {
+               PrintAndLog("UID must include 8 HEX symbols");
+               return 1;
+       }

        
        uint8_t iv[8] = { 0x00 };
        
        uint8_t iv[8] = { 0x00 };

-       uint8_t block = 0x07;
+       uint8_t block = 0x01;

        
        

-       // 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 dkeyA[8] = { 0x00 };
        uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
        uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
        uint8_t dkeyA[8] = { 0x00 };


@@ -1617,15 +1969,13 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
                , divkey         // output
                );
 
                , divkey         // output
                );
 

-       PrintAndLog("3DES version");
+       PrintAndLog("-- 3DES version");

        PrintAndLog("Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
        PrintAndLog("UID          :\t %s", sprint_hex(uid, sizeof(uid)));
        PrintAndLog("Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
        PrintAndLog("UID          :\t %s", sprint_hex(uid, sizeof(uid)));

-       PrintAndLog("Sector       :\t %0d", block);
+       PrintAndLog("block        :\t %0d", block);

        PrintAndLog("Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
        PrintAndLog("Message      :\t %s", sprint_hex(mix, sizeof(mix)));
        PrintAndLog("Diversified key: %s", sprint_hex(divkey+1, 6));
        PrintAndLog("Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
        PrintAndLog("Message      :\t %s", sprint_hex(mix, sizeof(mix)));
        PrintAndLog("Diversified key: %s", sprint_hex(divkey+1, 6));

-               
-       PrintAndLog("\n DES version");

        
        for (int i=0; i < sizeof(mifarekeyA); ++i){
                dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;
        
        for (int i=0; i < sizeof(mifarekeyA); ++i){
                dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;


@@ -1655,30 +2005,42 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
                , newpwd         // output
                );
        
                , newpwd         // output
                );
        

+       PrintAndLog("\n-- DES version");

        PrintAndLog("Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
        PrintAndLog("Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
        PrintAndLog("Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
        PrintAndLog("Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
        
        PrintAndLog("Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
        PrintAndLog("Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
        PrintAndLog("Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
        PrintAndLog("Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
        

+       // next. from the diversify_key method. 

        return 0;
 }
 
        return 0;
 }
 

-// static uint8_t * diversify_key(uint8_t * key){
-       
- // for(int i=0; i<16; i++){
-   // if(i<=6) key[i]^=cuid[i];
-   // if(i>6) key[i]^=cuid[i%7];
- // }
- // return key;
-// }
-
-// static void GenerateUIDe( uint8_t *uid, uint8_t len){
-       // for (int i=0; i<len; ++i){
-                       
-       // }
-       // return;
-// }
+int CmdHF14AMfUeLoad(const char *Cmd) {
+       char ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) return usage_hf_mfu_eload();
+       return CmdHF14AMfELoad(Cmd);
+}

 
 

+int CmdHF14AMfUSim(const char *Cmd) {
+       char ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) return usage_hf_mfu_sim();
+       return CmdHF14ASim(Cmd);
+}
+
+int CmdHF14AMfuPwdGen(const char *Cmd){
+       uint8_t uid[7] = {0x00};        
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_pwdgen();
+
+       if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
+       
+       PrintAndLog(" algo | pwd      | pack");
+       PrintAndLog("------+----------+-----");
+       PrintAndLog(" EV1  | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid));
+       PrintAndLog(" Ami  | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
+       PrintAndLog(" LD   | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
+       return 0;
+}

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


@@ -1687,20 +2049,22 @@ static command_t CommandTable[] =
        {"help",        CmdHelp,                        1, "This help"},
        {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
        {"info",        CmdHF14AMfUInfo,        0, "Tag information"},
        {"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"},
+       {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
+       {"eload",       CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},  
+       {"rdbl",        CmdHF14AMfURdBl,        0, "Read block"},
+       {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block"},

        {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},
        {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},

-       {"setpwd",      CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"},
-       {"setuid",      CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"},
+       {"setpwd",      CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
+       {"setuid",      CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
+       {"sim",         CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},             

        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},

+       {"pwdgen",      CmdHF14AMfuPwdGen, 1, "Generate pwd from known algos"},

        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){
        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){

-       WaitForResponseTimeout(CMD_ACK,NULL,100);
+       clearCommandBuffer();
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);

        CmdsParse(CommandTable, Cmd);
        return 0;
 }
        CmdsParse(CommandTable, Cmd);
        return 0;
 }