]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
fix: nice output..
[proxmark3-svn] / client / cmdhfmfu.c
index 6ab24a43edeac6f61a05d4387664fd48aa7b4529..8b5dca829efb4c48236994fda5bd474552821872 100644 (file)
@@ -13,7 +13,7 @@
 #include "cmdhf14a.h"
 #include "mifare.h"
 #include "util.h"
-#include "../common/protocols.h"
+#include "protocols.h"
 #include "data.h"
 
 #define MAX_UL_BLOCKS     0x0f
@@ -26,6 +26,9 @@
 #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] = {
@@ -54,17 +57,18 @@ uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
 };
 
-#define MAX_UL_TYPES 16
+#define MAX_UL_TYPES 17
 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};
+           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};
 
 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_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS};
+           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};
 
 
 static int CmdHelp(const char *Cmd);
 
+// get version nxp product type 
 char *getProductTypeStr( uint8_t id){
 
        static char buf[20];
@@ -102,17 +106,20 @@ char *getUlev1CardSizeStr( uint8_t fsize ){
 
 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}};
+       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);
+       clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
@@ -122,23 +129,7 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
        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();
@@ -193,6 +184,7 @@ 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);
+       clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
@@ -208,70 +200,6 @@ static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t pa
        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;
-       }
-       
-       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;
-}
-
-static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
-
-       uint8_t cmd[18];
-       memset(cmd, 0x00, sizeof(cmd));
-       datalen = ( datalen > 16) ? 16 : datalen;
-
-       cmd[0] = ISO14443A_CMD_WRITEBLOCK;
-       cmd[1] = page;
-       memcpy(cmd+2, data, datalen);
-
-       uint8_t response[1] = {0xff};
-       ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
-       // ACK
-       if ( response[0] == 0x0a ) return 0;
-       // NACK
-       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);   
-       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
@@ -343,13 +271,13 @@ static int ul_print_default( uint8_t *data){
        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){
-                       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 
@@ -390,7 +318,9 @@ static int ndef_print_CC(uint8_t *data) {
        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 )
+       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 )
                PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 496);
@@ -435,13 +365,15 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces){
        else if ( tagtype & NTAG_I2C_2K )       
                PrintAndLog("%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
        else if ( tagtype & MY_D )
-               PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\0153 (SLE 66RxxS)", spacer);
        else if ( tagtype & MY_D_NFC )
-               PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\0153 NFC (SLE 66RxxP)", spacer);
        else if ( tagtype & MY_D_MOVE )
-               PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\0153 move (SLE 66R01P)", spacer);
        else if ( tagtype & MY_D_MOVE_NFC )
-               PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
+               PrintAndLog("%sTYPE : INFINEON my-d\0153 move NFC (SLE 66R01P)", spacer);
+       else if ( tagtype & MY_D_MOVE_LEAN )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move lean (SLE 66R01L)", spacer);
        else
                PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype);
        return 0;
@@ -676,12 +608,15 @@ uint32_t GetHF14AMfU_Type(void){
                        }
                }
        } else {
+               ul_switch_off_field();
                // 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; //notice: we can not currently distinguish between these two
-                       case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; //notice: we can not currently distinguish between these two
+                       // 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
                }
        }
 
@@ -902,424 +837,6 @@ int CmdHF14AMfUInfo(const char *Cmd){
        return 1;
 }
 
-//
-//  Mifare Ultralight Write Single Block
-//
-int CmdHF14AMfUWrBl(const char *Cmd){
-       uint8_t blockNo    = -1;
-       bool chinese_card  = FALSE;
-       uint8_t bldata[16] = {0x00};
-       UsbCommand resp;
-
-       PrintAndLog("\n--- Tag Configuration");
-
-       bool strg_mod_en = (data[0] & 2);
-       uint8_t authlim = (data[4] & 0x07);
-       bool cfglck = (data[4] & 0x40);
-       bool prot = (data[4] & 0x80);
-       uint8_t vctid = data[5];
-        
-       PrintAndLog(" cfg0 [16/0x10]: %s", 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) );
-       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));
-       return 0;
-}
-
-static int ulev1_print_counters(){
-       PrintAndLog("--- Tag Counters");
-       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));
-               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 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 value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
-       PrintAndLog("    Elliptic curve parameters : secp128r1");
-       PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));
-       //to do:  verify if signature is valid
-       //PrintAndLog("IC signature status: %s valid", (iseccvalid() )?"":"not");
-       return 0;
-}
-
-static int ulev1_print_version(uint8_t *data){         
-       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 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]);
-       return 0;
-}
-
-/*
-static int ulc_magic_test(){
-       // Magic Ultralight test
-               // Magic UL-C, by observation,
-       // 1) it seems to have a static nonce response to 0x1A command.
-       // 2) the deskey bytes is not-zero:d out on as datasheet states.
-       // 3) UID - changeable, not only, but pages 0-1-2-3.
-       // 4) use the ul_magic_test !  magic tags answers specially!
-       int returnValue = UL_ERROR;
-       iso14a_card_select_t card;
-       uint8_t nonce1[11] = {0x00};
-       uint8_t nonce2[11] = {0x00};
-       int status = ul_select(&card);
-       if ( !status ){
-               return UL_ERROR;
-       }
-       status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
-       if ( status > 0 ) {
-               status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
-               returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
-       } else {
-               returnValue = UL;
-       }       
-       ul_switch_off_field();
-       return returnValue;
-}
-*/
-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:
-       iso14a_card_select_t card;
-       if ( !ul_select(&card) ) 
-               return UL_ERROR;
-       int status = ul_comp_write(0, NULL, 0);
-       ul_switch_off_field();
-       if ( status == 0 ) 
-               return MAGIC;
-       return 0;
-}
-
-       if (blockNo > MAX_UL_BLOCKS){
-               PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
-               return 1;
-       }
-       
-       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 ) 
-                                       tagtype = UL_EV1_48;
-                               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 )
-                                       tagtype = NTAG_212;
-                               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;                             
-                               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;
-                               
-                               break;
-                               }
-                       case 0x01: tagtype = UL_C; break;
-                       case 0x00: tagtype = UL; break;
-                       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
-               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));
-                       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();
-                       }
-               }
-       } else {
-               // 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; //notice: we can not currently distinguish between these two
-                       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;
-       int status;     
-       bool errors = false;
-       bool hasAuthKey = false;
-       bool locked = false;
-       bool swapEndian = false;
-       uint8_t cmdp = 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];
-                               
-       while(param_getchar(Cmd, cmdp) != 0x00)
-       {
-               switch(param_getchar(Cmd, cmdp))
-               {
-               case 'h':
-               case 'H':
-                       return usage_hf_mfu_info();
-               case 'k':
-               case 'K':
-                       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; 
-                       }
-                       cmdp += 2;
-                       hasAuthKey = true;
-                       break;
-               case 'l':
-               case 'L':
-                       swapEndian = true;
-                       cmdp++;
-                       break;
-               default:
-                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
-                       errors = true;
-                       break;
-               }
-               if(errors) break;
-       }
-
-       //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);
-       
-       // 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 ){
-               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_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");
-                       ul_switch_off_field();
-                       return status;
-               } 
-               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));
-                       if ( status == -1 ){
-                               ul_switch_off_field();
-                               PrintAndLog("Error: tag didn't answer to READ magic");
-                               return status;
-                       }
-                       if (status == 16) ulc_print_3deskey(ulc_deskey);
-
-               } else {
-                       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 ){
-                               key = default_3des_keys[i];
-                               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);
-                                       return 1;
-                               } 
-                       }
-                       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 (ulev1_print_counters() != 3) {
-                       // failed - 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 | NTAG_I2C_1K | NTAG_I2C_2K     ))) {
-               uint8_t ulev1_signature[32] = {0x00};
-               status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
-               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, 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 ){
-                       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;
-               }
-
-               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);
-                       }
-               }
-       
-               // AUTHLIMIT, (number of failed authentications)
-               // 0 = limitless.
-               // 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.");
-                       len = 0;
-                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ){
-                               key = default_pwd_pack[i];
-                                       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");
-               }
-       }
-
-       ul_switch_off_field();
-       if (locked) PrintAndLog("\nTag appears to be locked, try using the key to get more info");
-       PrintAndLog("");
-       return 1;
-}
-
 //
 //  Write Single Block
 //
@@ -1336,7 +853,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
        uint8_t blockdata[20] = {0x00};
        uint8_t data[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};
-       uint8_t *authkeyptr = authenticationkey;
+       uint8_t *authKeyPtr = authenticationkey;
        
        // starting with getting tagtype
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
@@ -1377,7 +894,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) {
@@ -1385,7 +902,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;
@@ -1416,30 +933,28 @@ int CmdHF14AMfUWrBl(const char *Cmd){
        if ( blockNo == -1 ) return usage_hf_mfu_wrbl();
        
        // Swap endianness 
-       if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, 16, 8);
-       if (swapEndian && hasPwdKey)  authkeyptr = 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,authkeyptr,16);
+               memcpy(c.d.asBytes+4,authKeyPtr,16);
        }
        else if ( hasPwdKey ) {
                c.arg[1] = 2;
-               memcpy(c.d.asBytes+4,authkeyptr,4);
+               memcpy(c.d.asBytes+4,authKeyPtr,4);
        }
        
+       clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -1465,8 +980,8 @@ int CmdHF14AMfURdBl(const char *Cmd){
        uint8_t keylen = 0;
        uint8_t data[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};
-       uint8_t *authkeyptr = authenticationkey;
-               
+       uint8_t *authKeyPtr = authenticationkey;
+
        // starting with getting tagtype
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
@@ -1506,7 +1021,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) {
@@ -1532,30 +1047,34 @@ 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) authkeyptr = SwapEndian64(authenticationkey, 16, 8);
-       if (swapEndian && hasPwdKey)  authkeyptr = 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,authkeyptr,16);
+               memcpy(c.d.asBytes,authKeyPtr,16);
        }
        else if ( hasPwdKey ) {
                c.arg[1] = 2;
-               memcpy(c.d.asBytes,authkeyptr,4);
+               memcpy(c.d.asBytes,authKeyPtr,4);
        }
        
+       clearCommandBuffer();
        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;
-                       PrintAndLog("Block: %0d (0x%02X) [ %s]", 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);
@@ -1563,7 +1082,6 @@ int CmdHF14AMfURdBl(const char *Cmd){
        } else {
                PrintAndLog("Command execute time-out");
        }
-
        return 0;
 }
 
@@ -1637,8 +1155,6 @@ int usage_hf_mfu_wrbl(void) {
 //
 //  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;
@@ -1727,10 +1243,10 @@ int CmdHF14AMfUDump(const char *Cmd){
        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...");
@@ -1743,6 +1259,8 @@ int CmdHF14AMfUDump(const char *Cmd){
 
                memcpy(c.d.asBytes, authKeyPtr, dataLen);
        }
+
+       clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
@@ -1754,12 +1272,13 @@ 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;
@@ -1800,9 +1319,11 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
+       PrintAndLog("\nBlock#  | 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+startPage, i+startPage, sprint_hex(data + i * 4, 4));
                        continue;
                }
                switch(i){
@@ -1849,8 +1370,9 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 43: tmplockbit = bit2[9]; break;  //auth1
                        default: break;
                }
-               PrintAndLog("Block %02X:%s [%d] {%.4s}", i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
+               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) {
@@ -2023,7 +1545,6 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 
        uint8_t pwd[16] = {0x00};       
        
-       uint8_t key[16];
        char cmdp = param_getchar(Cmd, 0);
 
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
@@ -2039,14 +1560,10 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
                PrintAndLog("Password must include 32 HEX symbols");
                return 1;
        }
-
-       if (blockNo > MAX_ULC_BLOCKS ){
-               PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
-               return 1;
-       } 
        
        UsbCommand c = {CMD_MIFAREUC_SETPWD};   
        memcpy( c.d.asBytes, pwd, 16);
+       clearCommandBuffer();
        SendCommand(&c);
 
        UsbCommand resp;
@@ -2095,6 +1612,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        // read block2. 
        c.cmd = CMD_MIFAREU_READBL;
        c.arg[0] = 2;
+       clearCommandBuffer();
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute timeout");
@@ -2112,6 +1630,7 @@ 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];
+       clearCommandBuffer();
        SendCommand(&c);
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute timeout");
@@ -2124,6 +1643,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        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");
@@ -2136,6 +1656,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        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");
@@ -2252,7 +1773,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