]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
CHG: moved a xor function into util.c
[proxmark3-svn] / client / cmdhfmfu.c
index 147bbb926944e32b9e0521fc2c90ff20ee63d1aa..5153e8ec1b3d813cb3dac01892420f0e70fb0db8 100644 (file)
 #include "../common/protocols.h"
 #include "data.h"
 
-#define MAX_UL_BLOCKS          0x0f
-#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_UL_BLOCKS     0x0f
+#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 KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
@@ -35,25 +35,25 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
                { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
                { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
                { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF },// 11 22 33
-       };
+               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
+};
 
 #define KEYS_PWD_COUNT 10
 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)
-       
+
        {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) 
-};     
-       
+};
+
 #define MAX_UL_TYPES 16
 uint16_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};
@@ -65,9 +65,9 @@ uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_B
 
 static int CmdHelp(const char *Cmd);
 
-chargetProductTypeStr( uint8_t id){
+char *getProductTypeStr( uint8_t id){
 
-       static char buf[20];
+       static char buf[20];
        char *retStr = buf;
 
        switch(id) {
@@ -83,18 +83,18 @@ char* getProductTypeStr( uint8_t id){
   the LSBit is set to '0' if the size is exactly 2^n
   and set to '1' if the storage size is between 2^n and 2^(n+1). 
 */
-chargetUlev1CardSizeStr( uint8_t fsize ){
-       static char buf[40];
+char *getUlev1CardSizeStr( uint8_t fsize ){
+
+       static char buf[40];
        char *retStr = buf;
-       memset(buf, 0, sizeof(buf));    
-       
+       memset(buf, 0, sizeof(buf));
+
        uint16_t usize = 1 << ((fsize >>1) + 1);
        uint16_t lsize = 1 << (fsize >>1);
 
        // is  LSB set?
-       if ( fsize & 1 )
-               sprintf(retStr, "%02X, (%u <-> %u bytes)", fsize, usize, lsize);
+       if (  fsize & 1 )
+               sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
        else 
                sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);              
        return buf;
@@ -115,9 +115,9 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
        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;
-       
+       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;
@@ -127,7 +127,7 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
        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;
@@ -135,12 +135,12 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
        if (!resp.arg[0] && responseLength) return -1;
 
        uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-               memcpy(response, resp.d.asBytes, resplen );
+       memcpy(response, resp.d.asBytes, resplen);
        return resplen;
 }
 */
 static int ul_select( iso14a_card_select_t *card ){
-       
+
        ul_switch_on_field();
 
        UsbCommand resp;
@@ -151,14 +151,14 @@ static int ul_select( iso14a_card_select_t *card ){
                ul_switch_off_field();
                return 0;
        }
-       
+
        memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
        return 1;
 }
 
 // This read command will at least return 16bytes.
 static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
-       
+
        uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
        int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
        return len;
@@ -179,36 +179,37 @@ static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
        // ACK
        if ( response[0] == 0x0a ) return 0;
        // NACK
-       return -1;      
+       return -1;
 }
 
 static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
-       
+
        uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
        int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
        return len;
 }
 
 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);   
+       memcpy(c.d.asBytes, key, 16);
        SendCommand(&c);
        UsbCommand resp;
        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
        if ( resp.arg[0] == 1 ) return 1;
-       
+
        return 0;
 }
 
 static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
-       
+
        uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
        int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
        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)) {
@@ -230,7 +231,7 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
 }
 
 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
-       
+
        uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; 
        int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
        return len;
@@ -268,7 +269,7 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 }
 
 static int ul_print_default( uint8_t *data){
-       
+
        uint8_t uid[7];
        uid[0] = data[0];
        uid[1] = data[1];
@@ -294,13 +295,13 @@ static int ul_print_default( uint8_t *data){
                PrintAndLog("      BCC0 : %02X, Ok", data[3]);
        else
                PrintAndLog("      BCC0 : %02X, crc should be %02X", data[3], crc0);
-       
+
        int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
        if ( data[8] == crc1 )
                PrintAndLog("      BCC1 : %02X, Ok", data[8]);
        else
                PrintAndLog("      BCC1 : %02X, crc should be %02X", data[8], crc1 );
-       
+
        PrintAndLog("  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
 
        PrintAndLog("      Lock : %s - %s",
@@ -332,11 +333,11 @@ static int ndef_print_CC(uint8_t *data) {
                PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 496);
        else if ( data[2] == 0x6d )
                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;                               
+       return 0;
 }
 
 int ul_print_type(uint32_t tagtype, uint8_t spaces){
@@ -383,7 +384,7 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
        return 0;
 }
 
-static int ulc_print_3deskey( uint8_t *data){                  
+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);
@@ -393,7 +394,7 @@ static int ulc_print_3deskey( uint8_t *data){
 }
 
 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));
@@ -415,7 +416,7 @@ static int ulc_print_configuration( uint8_t *data){
        return 0;
 }
 
-static int ulev1_print_configuration( uint8_t *data){
+static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
 
        PrintAndLog("\n--- Tag Configuration");
 
@@ -424,23 +425,24 @@ static int ulev1_print_configuration( uint8_t *data){
        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");
-       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);
        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;
 }
 
@@ -453,16 +455,16 @@ static int ulev1_print_counters(){
                ulev1_readTearing(i,tear,sizeof(tear));
                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");
-       }
+                       PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
+                       PrintAndLog("                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+               }
        }
        return len;
 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
        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 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));
@@ -471,16 +473,16 @@ static int ulev1_print_signature( uint8_t *data, uint8_t len){
        return 0;
 }
 
-static int ulev1_print_version(uint8_t *data){         
+static int ulev1_print_version(uint8_t *data){
        PrintAndLog("\n--- Tag Version");
-       PrintAndLog("       Raw bytes : %s", sprint_hex(data, 8) );
+       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 subtype : %02X, %s"       , data[3], (data[3]==1) ?"17 pF":"50pF");
-       PrintAndLog("   Major version : %02X"   , data[4]);
-       PrintAndLog("   Minor version : %02X"   , data[5]);
+       PrintAndLog("    Product type : %s", getProductTypeStr(data[2]));
+       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("   Protocol type : %02X"   , data[7]);
+       PrintAndLog("   Protocol type : %02X", data[7]);
        return 0;
 }
 
@@ -512,7 +514,7 @@ static int ulc_magic_test(){
 }
 */
 static int ul_magic_test(){
-       
+
        // Magic Ultralight tests
        // 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:
@@ -542,19 +544,19 @@ uint32_t GetHF14AMfU_Type(void){
                ul_switch_off_field();
                return UL_ERROR;
        }
-       
+
        if ( card.uid[0] != 0x05) {
 
                len  = ulev1_getVersion(version, sizeof(version));
                ul_switch_off_field();
-       
+
                switch (len) {
                        case 0x0A: {
-                       
-                               if ( version[2] == 0x03 && version[6] == 0x0B ) 
+
+                               if ( version[2] == 0x03 && version[6] == 0x0B )
                                        tagtype = UL_EV1_48;
-                               else if ( version[2] == 0x03 && version[6] != 0x0B ) 
-                                       tagtype = UL_EV1_128;                                   
+                               else if ( version[2] == 0x03 && version[6] != 0x0B )
+                                       tagtype = UL_EV1_128;
                                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 )
@@ -562,21 +564,21 @@ uint32_t GetHF14AMfU_Type(void){
                                else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x0F )
                                        tagtype = NTAG_213;
                                else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x11 )
-                                       tagtype = NTAG_215;     
-                               else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 )                              
-                                       tagtype = NTAG_216;                             
+                                       tagtype = NTAG_215;
+                               else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 )
+                                       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 ) 
+                               else if ( version[2] == 0x04 )
                                        tagtype = NTAG;
-                               
+
                                break;
-                               }
+                       }
                        case 0x01: tagtype = UL_C; break;
                        case 0x00: tagtype = UL; break;
-                       case -1  : tagtype = (UL | UL_C | NTAG_203); break;  //when does this happen?  -- if getversion fails, it assumes it is either UL/ULC -- but why? magic tags?
+                       case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags
                        default  : tagtype = UNKNOWN; break;
                }
                // UL vs UL-C vs ntag203 test
@@ -600,7 +602,7 @@ uint32_t GetHF14AMfU_Type(void){
                                        tagtype = UL;
                                } else {
                                        // read page 0x30 (should error if it is a ntag203)
-                                       status = ul_read(30, data, sizeof(data));
+                                       status = ul_read(0x30, data, sizeof(data));
                                        if ( status <= 1 ){
                                                tagtype = NTAG_203;
                                        } else {
@@ -619,29 +621,33 @@ uint32_t GetHF14AMfU_Type(void){
                        case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; //notice: we can not currently distinguish between these two
                }
        }
-       
 
        tagtype |= ul_magic_test();
        if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
        return tagtype;
-}      
+}
 
 int CmdHF14AMfUInfo(const char *Cmd){
 
        uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
-       uint8_t *key;
-       int status;     
+       int status;
        bool errors = false;
        bool hasAuthKey = false;
        bool locked = false;
+       bool swapEndian = false;
        uint8_t cmdp = 0;
-       uint8_t datalen = 0;
+       uint8_t dataLen = 0;
        uint8_t authenticationkey[16] = {0x00};
+       uint8_t *authkeyptr = authenticationkey;
+       uint8_t *key;
        uint8_t pack[4] = {0,0,0,0};
        int len = 0;
-                               
+       char tempStr[50];
+
+       clearCommandBuffer();
+       
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
@@ -651,23 +657,21 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        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));
@@ -679,32 +683,35 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
        //Validations
        if(errors) return usage_hf_mfu_info();
-       
+
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
        PrintAndLog("\n--- Tag Information ---------");
        PrintAndLog("-------------------------------------------------------------");
        ul_print_type(tagtype, 6);
-       
-       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+
+       // 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,3 (should read 4pages)
        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;
        } else if (status == 16) {
                ul_print_default(data);
                ndef_print_CC(data+12);
-       }       else {
+       } else {
                locked = true;
        }
 
        // UL_C Specific
-       if ((tagtype & UL_C)){
-       
+       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));
@@ -716,11 +723,11 @@ int CmdHF14AMfUInfo(const char *Cmd){
                if (status == 16) ulc_print_configuration(ulc_conf);
                else locked = true;
 
-               if ((tagtype & MAGIC)){
+               if ((tagtype & MAGIC)) {
                        //just read key
                        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;
@@ -731,21 +738,20 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        ul_switch_off_field();
                        // 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");
-                       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];
-                               if (ulc_authentication(key, true)){
+                               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);
-                                       break;
+                                       return 1;
                                } 
                        }
-                       // reselect for future tests (ntag test)
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       return 1;
                }
        }
 
@@ -755,29 +761,29 @@ int CmdHF14AMfUInfo(const char *Cmd){
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
                if (ulev1_print_counters() != 3) {
                        // failed - re-select
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       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 | NTAG_I2C_1K | NTAG_I2C_2K     ))) {
                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;
-               }               
+               }
                if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
                else {
                        // re-select
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                }
        }
-       
+
        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));
-               if ( status == -1 ){
+               if ( status == -1 ) {
                        PrintAndLog("Error: tag didn't answer to GETVERSION");
                        ul_switch_off_field();
                        return status;
@@ -785,7 +791,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        ulev1_print_version(version);
                } else {
                        locked = true;
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                }
 
                uint8_t startconfigblock = 0;
@@ -796,18 +802,18 @@ int CmdHF14AMfUInfo(const char *Cmd){
                                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);
+                       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.
                // 1-7 = limit. No automatic tries then.
@@ -815,15 +821,15 @@ int CmdHF14AMfUInfo(const char *Cmd){
                if ( !authlim && !hasAuthKey ) {
                        PrintAndLog("\n--- Known EV1/NTAG passwords.");
                        len = 0;
-                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ){
+                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
                                key = default_pwd_pack[i];
-                                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                               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, authenticationkey, pack, sizeof(pack))) return -1;
-                       }
+                                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+                               }
                        }
                        if (len < 1) PrintAndLog("password not known");
                }
@@ -851,7 +857,9 @@ int CmdHF14AMfUWrBl(const char *Cmd){
        uint8_t blockdata[20] = {0x00};
        uint8_t data[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};
-       uint8_t *keyPtr = authenticationkey;
+       uint8_t *authKeyPtr = authenticationkey;
+       
+       clearCommandBuffer();
        
        // starting with getting tagtype
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
@@ -892,7 +900,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
                                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]+1;
+                                               maxblockno = UL_MEMORY_ARRAY[idx];
                                }
                
                                if (blockNo < 0) {
@@ -900,7 +908,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
                                        errors = true;                                  
                                }
                                if (blockNo > maxblockno){
-                                       PrintAndLog("block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
+                                       PrintAndLog("block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
                                        errors = true;                                                                  
                                }
                                cmdp += 2;
@@ -931,27 +939,25 @@ int CmdHF14AMfUWrBl(const char *Cmd){
        if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
        
        // Swap endianness 
-       if (swapEndian && hasAuthKey) keyPtr = SwapEndian64(authenticationkey, 16, 8);
-       if (swapEndian && hasPwdKey)  keyPtr = SwapEndian64(authenticationkey, 4, 4);
+       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));
        
-       
-
        //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,authenticationkey,16);
+               memcpy(c.d.asBytes+4,authKeyPtr,16);
        }
        else if ( hasPwdKey ) {
                c.arg[1] = 2;
-               memcpy(c.d.asBytes+4,authenticationkey,4);
+               memcpy(c.d.asBytes+4,authKeyPtr,4);
        }
        
        SendCommand(&c);
@@ -979,7 +985,9 @@ int CmdHF14AMfURdBl(const char *Cmd){
        uint8_t keylen = 0;
        uint8_t data[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};
-       uint8_t *keyPtr = authenticationkey;
+       uint8_t *authKeyPtr = authenticationkey;
+
+       clearCommandBuffer();
        
        // starting with getting tagtype
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
@@ -1020,7 +1028,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
                                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]+1;
+                                               maxblockno = UL_MEMORY_ARRAY[idx];
                                }
                
                                if (blockNo < 0) {
@@ -1046,26 +1054,25 @@ int CmdHF14AMfURdBl(const char *Cmd){
                //Validations
                if(errors) return usage_hf_mfu_rdbl();
        }
-
        if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
        
        // Swap endianness 
-       if (swapEndian && hasAuthKey) keyPtr = SwapEndian64(authenticationkey, 16, 8);
-       if (swapEndian && hasPwdKey)  keyPtr = SwapEndian64(authenticationkey, 4, 4);
+       if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
+       if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
        
        //Read Block
        UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
        if ( hasAuthKey ){
                c.arg[1] = 1;
-               memcpy(c.d.asBytes,authenticationkey,16);
+               memcpy(c.d.asBytes,authKeyPtr,16);
        }
        else if ( hasPwdKey ) {
                c.arg[1] = 2;
-               memcpy(c.d.asBytes,authenticationkey,4);
+               memcpy(c.d.asBytes,authKeyPtr,4);
        }
        
        SendCommand(&c);
-       UsbCommand resp;
+       UsbCommand resp;
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                uint8_t isOK = resp.arg[0] & 0xff;
                if (isOK) {
@@ -1085,28 +1092,29 @@ 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("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("Usage:  hf mfu info h k <key>");
+       PrintAndLog("Usage:  hf mfu info k <key> l");
        PrintAndLog("  Options : ");
-       PrintAndLog("  h       : this help");
-       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("          : hf mfu info k 11223344");
+       PrintAndLog("          : hf mfu info k 00112233445566778899AABBCCDDEEFF");
+       PrintAndLog("          : hf mfu info k AABBCCDDD");
        return 0;
 }
 
 int usage_hf_mfu_dump(void) {
        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("Usage:  hf mfu dump l k <key> n <filename w/o .bin> p <> q <>");
+       PrintAndLog("Usage:  hf mfu dump k <key> l n <filename w/o .bin>");
        PrintAndLog("  Options : ");
-       PrintAndLog("  h       : this help");
-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-       PrintAndLog("  l       : swap entered key's endianness for auth");
+       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");      
@@ -1115,49 +1123,46 @@ int usage_hf_mfu_dump(void) {
        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 h l b <block number> k <key> \n");
+       PrintAndLog("Usage:  hf mfu rdbl b <block number> k <key> l\n");
        PrintAndLog("  Options:");
-       PrintAndLog("  h       : this help");
        PrintAndLog("  b <no>  : block to read");
-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-       PrintAndLog("  l       : swap entered key's endianness");       
+       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("   sample : hf mfu rdbl b 0");
        PrintAndLog("          : hf mfu rdbl b 0 k 00112233445566778899AABBCCDDEEFF");
-       PrintAndLog("          : hf mfu rdbl b 0 k 11223344\n");
+       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("  h        : this help");
+       PrintAndLog("  Options:");      
        PrintAndLog("  b <no>   : block to write");
-       PrintAndLog("  d <data> : [block data] - (8 hex symbols)");
-       PrintAndLog("  k <key>  : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-       PrintAndLog("  l        : swap entered key's endianness");      
+       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 01020304");
-       PrintAndLog("           : hf mfu wrbl b 0 d 01020304 k 11223344\n");
+       PrintAndLog("    sample : hf mfu wrbl b 0 d 01234567");
+       PrintAndLog("           : hf mfu wrbl b 0 d 01234567 k AABBCCDDD\n");
        return 0;
 }
 
 //
 //  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;
+       char *fnameptr = filename;
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
        uint8_t *lockbytes_t2 = NULL;
@@ -1165,14 +1170,14 @@ int CmdHF14AMfUDump(const char *Cmd){
        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;
-       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};
+       uint8_t *authKeyPtr = authenticationkey;
        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;
@@ -1180,6 +1185,8 @@ int CmdHF14AMfUDump(const char *Cmd){
        uint8_t startPage = 0;
        char tempStr[50];
 
+       clearCommandBuffer();
+       
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
@@ -1190,17 +1197,15 @@ int CmdHF14AMfUDump(const char *Cmd){
                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;
                        }
-                               
                        cmdp += 2;
-                               hasPwd = true;
+                       hasAuthKey = true;
                        break;
                case 'l':
                case 'L':
@@ -1236,32 +1241,32 @@ int CmdHF14AMfUDump(const char *Cmd){
 
        //Validations
        if(errors) return usage_hf_mfu_dump();
-       
-       if (swapEndian && dataLen == 32)
-               keyPtr = SwapEndian64(data, 16, 8);
+
+       if (swapEndian && hasAuthKey) 
+               authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
        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])
-                               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...");
        UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
-       if ( hasPwd ) { 
+       if ( hasAuthKey ) {
                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);
        }
        SendCommand(&c);
        UsbCommand resp;
-       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+       if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
                PrintAndLog("Command execute time-out");
                return 1;
        }
@@ -1270,25 +1275,26 @@ int CmdHF14AMfUDump(const char *Cmd){
                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, 0);
+       GetFromBigBuf(data, bufferSize, startindex);
        WaitForResponse(CMD_ACK,NULL);
 
        Pages = bufferSize/4;
        // Load lock bytes.
        int j = 0;
-       
+
        lockbytes_t = data + 8;
        lockbytes[0] = lockbytes_t[2];
        lockbytes[1] = lockbytes_t[3];
        for(j = 0; j < 16; j++){
                bit[j] = lockbytes[j/8] & ( 1 <<(7-j%8));
-       }               
-       
+       }
+
        // Load bottom lockbytes if available
        // TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
        if ( Pages == 44 ) {
@@ -1301,17 +1307,26 @@ int CmdHF14AMfUDump(const char *Cmd){
        }
 
        // add keys to block dump
-       if (hasPwd && (tagtype & UL_C)){ //UL_C
-               memcpy(data + Pages*4, key, dataLen/2);
-               Pages += 4;
-       } else if (hasPwd) { //not sure output is in correct location.
-               memcpy(data + Pages*4, key, dataLen/2);
-               Pages += 1;
+       if (hasAuthKey) {
+               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);
+               }
        }
-       
+
+       PrintAndLog("Block#  | Data        |lck| Ascii");
+       PrintAndLog("---------------------------------");
        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 | |", i, i,sprint_hex(data + i * 4, 4));
                        continue;
                }
                switch(i){
@@ -1339,7 +1354,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 24:
                        case 25:
                        case 26:
-                       case 27: tmplockbit = bit2[4]; break;               
+                       case 27: tmplockbit = bit2[4]; break;
                        case 28:
                        case 29:
                        case 30:
@@ -1358,21 +1373,22 @@ int CmdHF14AMfUDump(const char *Cmd){
                        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 , i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
+       }
+       PrintAndLog("---------------------------------");
+
        // user supplied filename?
        if (fileNlen < 1) {
                // UID = data 0-1-2 4-5-6-7  (skips a beat)
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
-                       data[0], data[1], data[2], data[4], data[5], data[6], data[7]);
+                       data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
        } else {
                sprintf(fnameptr + fileNlen,".bin");
        }
 
        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);
@@ -1390,11 +1406,13 @@ int CmdHF14AMfUDump(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);
 
+       clearCommandBuffer();
+
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);
@@ -1424,7 +1442,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
                PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");
-                       
+               
        return 0;
 }
 
@@ -1533,6 +1551,8 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
        uint8_t pwd[16] = {0x00};       
        
        char cmdp = param_getchar(Cmd, 0);
+
+       clearCommandBuffer();
        
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
                PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
@@ -1580,6 +1600,8 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        
+       clearCommandBuffer();
+       
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
                PrintAndLog("Usage:  hf mfu setuid <uid (14 hex symbols)>");
                PrintAndLog("       [uid] - (14 hex symbols)");
@@ -1603,7 +1625,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
                PrintAndLog("Command execute timeout");
                return 2;
        }
-       
+
        // save old block2.
        uint8_t oldblock2[4] = {0x00};
        memcpy(resp.d.asBytes, oldblock2, 4);
@@ -1620,7 +1642,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
                PrintAndLog("Command execute timeout");
                return 3;
        }
-       
+
        // block 1.
        c.arg[0] = 1;
        c.d.asBytes[0] = uid[3];
@@ -1755,7 +1777,7 @@ static command_t CommandTable[] =
        {"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"},
+       {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
        {"rdbl",        CmdHF14AMfURdBl,        0, "Read block"},
        {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block"},    
        {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},
Impressum, Datenschutz