]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
ADD: @marshmellows fixes
[proxmark3-svn] / client / cmdhfmfu.c
index 448c20080e04ae91fbec887107f75f5655c9f5ad..aed77d82ac5aa49355b0fedbb81b084a74480a4b 100644 (file)
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "mifare.h"
-
-#define MAX_UL_BLOCKS   0x0f
-#define MAX_ULC_BLOCKS  0x2f
-#define MAX_ULEV1a_BLOCKS 0x0b;
-#define MAX_ULEV1b_BLOCKS 0x20;
-
-uint8_t default_3des_keys[7][16] = {
+#include "util.h"
+#include "../common/protocols.h"
+
+#define MAX_UL_BLOCKS          0x0f
+#define MAX_ULC_BLOCKS         0x2f
+#define MAX_ULEV1a_BLOCKS      0x0b
+#define MAX_ULEV1b_BLOCKS      0x20
+#define MAX_NTAG_213           0x2c
+#define MAX_NTAG_215           0x86
+#define MAX_NTAG_216      0xe6
+
+#define KEYS_3DES_COUNT 7
+uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
                { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
                { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },// all zeroes
                { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },// 0x00-0x0F
@@ -27,191 +33,739 @@ uint8_t default_3des_keys[7][16] = {
                { 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
        };
+
+#define KEYS_PWD_COUNT 8
+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)       
+       {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) 
+};     
        
 static int CmdHelp(const char *Cmd);
 
-// return 1 if tag responded to 0x1A.
-uint8_t requestAuthentication( uint8_t* nonce){
+char* getProductTypeStr( uint8_t id){
+
+       static char buf[20];
+       char *retStr = buf;
+
+       switch(id) {
+        case 3:
+               sprintf(retStr, "%02X, %s", id, "Ultralight");
+               break;
+       case 4:
+               sprintf(retStr, "%02X, %s", id, "NTAG");
+               break;
+       default:
+               sprintf(retStr, "%02X, %s", id, "unknown");
+               break;
+       }
+       return buf;
+}
+
+/*
+  The 7 MSBits (=n) code the storage size itself based on 2^n, 
+  the LSBit is set to '0' if the size is exactly 2^n
+  and set to '1' if the storage size is between 2^n and 2^(n+1). 
+*/
+char* getUlev1CardSizeStr( uint8_t fsize ){
+       static char buf[40];
+       char *retStr = 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);
+       else 
+               sprintf(retStr, "%02X (%u bytes)", fsize, lsize);               
+       return buf;
+}
+
+static void ul_switch_on_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       SendCommand(&c);
+}
 
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC ,2 ,0}};
-       c.d.asBytes[0] = 0x1A;
-       c.d.asBytes[1] = 0x00;
+void ul_switch_off_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
-       UsbCommand resp;        
-       WaitForResponse(CMD_ACK, &resp);  // skip select answer.
+}
 
-       if ( !(resp.arg[0] & 0xff) ) 
-               return 0;
+static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC, cmdlen, 0}};
+       memcpy(c.d.asBytes, cmd, cmdlen);
+       SendCommand(&c);
+       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_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;
        
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+       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 ){
        
-               if ( resp.arg[0] & 0xff ) {
-                       memcpy(nonce, resp.d.asBytes+1, 8);
-                       return 1;
+       ul_switch_on_field();
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+       if (resp.arg[0] < 1) return -1;
+       
+       memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
+       return resp.arg[0];
+}
+
+// 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);
+       if ( len == -1 )
+               ul_switch_off_field();
+       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};
+       int len = ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
+       if ( len == -1 )
+               ul_switch_off_field();
+       // 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);
+       if ( len == -1 ) 
+               ul_switch_off_field();
+       return len;
+}
+
+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);
+       if ( len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+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);
+       if ( len == -1 )
+               ul_switch_off_field();
+       return len;
+}
+
+// static int ulev1_fastRead( uint8_t startblock, uint8_t endblock, uint8_t *response ){
+       
+       // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock};
+       
+       // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){
+               // ul_switch_off_field();
+               // return -1;
+       // }
+       // return 0;
+// }
+
+static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_readTearing( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_CHECKTEAR, counter};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ul_print_default( uint8_t *data){
+       
+       uint8_t uid[7];
+       uid[0] = data[0];
+       uid[1] = data[1];
+       uid[2] = data[2];
+       uid[3] = data[4];
+       uid[4] = data[5];
+       uid[5] = data[6];
+       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 ) {
+               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;
                }
-       } 
+       }
+       // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
+       int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
+       if ( data[3] == crc0 )
+               PrintAndLog("      BCC0 : %02X, Ok", data[3]);
+       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",
+                               sprint_hex(data+10, 2),
+                               printBits(2, data+10)
+               );
+
+       PrintAndLog("OneTimePad : %s - %s\n",
+                               sprint_hex(data + 12, 4),
+                               printBits(4, data+12)
+               );
+
        return 0;
 }
 
-typedef enum TAGTYPE_UL {
-       UNKNOWN         = 0x00,
-       UL                      = 0x01,
-       UL_C            = 0x02,
-       UL_EV1_48       = 0x04,
-       UL_EV1_128      = 0x08,
-       MAGIC           = 0x10,
-       UL_MAGIC        = UL | MAGIC,
-       UL_C_MAGIC      = UL_C | MAGIC,
-       UL_ERROR        = 0xFF,
-} TagTypeUL_t;
+static int ntag_print_CC(uint8_t *data) {
 
-uint8_t GetHF14AMfU_Type(){
+       PrintAndLog("\n--- NTAG NDEF Message");
+       
+       if(data[0] != 0xe1) {
+               PrintAndLog("no NDEF message found");
+               return -1;              // no NDEF message
+       }
 
-       TagTypeUL_t tagtype = UNKNOWN;
-       iso14a_card_select_t card;
+       PrintAndLog("Capability Container: %s", sprint_hex(data,4) );
+       PrintAndLog("  %02X: NDEF Magic Number", data[0]); 
+       PrintAndLog("  %02X: version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
+       PrintAndLog("  %02X: Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
+       if ( data[2] == 0x12 )
+               PrintAndLog("  %02X: NDEF Memory Size: %d bytes", data[2], 144);
+       else if ( data[2] == 0x3e )
+               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;                               
+}
 
-       // select and run 0x60 (GET_VERSION - EV1 command)
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC, 1, 0}};
-       c.d.asBytes[0] = 0x60;
-       SendCommand(&c);
-       UsbCommand resp;
-       WaitForResponse(CMD_ACK, &resp);
+int ul_print_type(uint16_t tagtype, uint8_t spaces){
+       char spc[11] = "          ";
+       spc[10]=0x00;
+       char *spacer = spc + (10-spaces);
+
+       if ( tagtype & UL )     
+               PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+       else if ( tagtype & UL_C)
+               PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+       else if ( tagtype & UL_EV1_48)
+               PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
+       else if ( tagtype & UL_EV1_128) 
+               PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+       else if ( tagtype & NTAG_213 )
+               PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+       else if ( tagtype & NTAG_215 )
+               PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+       else if ( tagtype & NTAG_216 )
+               PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+       else if ( tagtype & MY_D )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
+       else if ( tagtype & MY_D_NFC )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
+       else if ( tagtype & MY_D_MOVE )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
+       else if ( tagtype & MY_D_MOVE_NFC )
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
+       else
+               PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);
+       return 0;
+}
+
+static int ulc_print_3deskey( uint8_t *data){                  
+       PrintAndLog("         deskey1 [44/0x2C]: %s [%.4s]", sprint_hex(data   ,4),data);
+       PrintAndLog("         deskey1 [45/0x2D]: %s [%.4s]", sprint_hex(data+4 ,4),data+4);
+       PrintAndLog("         deskey2 [46/0x2E]: %s [%.4s]", sprint_hex(data+8 ,4),data+8);
+       PrintAndLog("         deskey2 [47/0x2F]: %s [%.4s]", sprint_hex(data+12,4),data+12);
+       PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
+       return 0;
+}
 
-       if ( resp.arg[0] == 0 ) return UL_ERROR;
+static int ulc_print_configuration( uint8_t *data){
                
-       memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+       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));
+
+       bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
+       if ( validAuth )
+               PrintAndLog("           Auth0 [42/0x2A]: %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
+       else{
+               if ( data[8] == 0){
+                       PrintAndLog("           Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );
+               } else {
+                       PrintAndLog("           Auth0 [42/0x2A]: %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+               }
+       }
+       PrintAndLog("           Auth1 [43/0x2B]: %s %s",
+                       sprint_hex(data+12, 4),
+                       (data[12] & 1) ? "write access restricted": "read and write access restricted"
+                       );
+       return 0;
+}
+
+static int ulev1_print_configuration( uint8_t *data){
+
+       PrintAndLog("\n--- UL-EV1 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("--- UL-EV1 Counters");
+       uint8_t tear[1] = {0};
+       uint8_t counter[3] = {0,0,0};
+       for ( uint8_t i = 0; i<3; ++i) {
+               ulev1_readTearing(i,tear,sizeof(tear));
+               ulev1_readCounter(i,counter, sizeof(counter) );
+               PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
+               PrintAndLog("                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+       }
+       return 0;
+}
+
+static int ulev1_print_signature( uint8_t *data, uint8_t len){
+       PrintAndLog("\n--- UL-EV1 Signature");  
+       PrintAndLog("IC signature public key name  : NXP NTAG21x 2013");
+       PrintAndLog("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--- UL-EV1 / NTAG Version");
+       PrintAndLog("       Raw bytes : %s", sprint_hex(data, 8) );
+       PrintAndLog("       Vendor ID : %02X, Manufacturer: %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 < 1 ){
+               PrintAndLog("Error: couldn't select ulc_magic_test");
+               ul_switch_off_field();
+               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(){
        
-       // Ultralight - ATQA / SAK 
-       if ( card.atqa[1] != 0x00 && card.atqa[0] != 0x44 && card.sak != 0x00 ) return UL_ERROR;
+       // 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;
+       int status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("iso14443a card select failed");
+               ul_switch_off_field();
+               return UL_ERROR;
+       }
+       status = ul_comp_write(0, NULL, 0);
+       ul_switch_off_field();
+       if ( status == 0 ) 
+               return UL_MAGIC;
+       return UL;
+}
 
-       // EV1 GetVersion
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+uint16_t GetHF14AMfU_Type(void){
 
-               uint8_t version[8] = {0,0,0,0,0,0,0,0};
-               memcpy(&version, resp.d.asBytes, sizeof(version));
-               uint8_t len  = resp.arg[0] & 0xff;
-               
-               if ( len == 0x0A && version[6] == 0x0B ) 
-                       tagtype = UL_EV1_48;
-               else if ( len == 0x0A && version[6] != 0x0B ) 
-                       tagtype = UL_EV1_128;
-               else if ( len == 0x01 )
-                       tagtype = UL_C; 
-               else if ( len == 0x00 )
-                       tagtype = UL;
+       TagTypeUL_t tagtype = UNKNOWN;
+       iso14a_card_select_t card;
+       uint8_t version[10] = {0x00};
+       int status = 0;
+       int len;
+
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("iso14443a card select failed");
+               ul_switch_off_field();
+               return UL_ERROR;
+       }
+       // Ultralight - ATQA / SAK 
+       if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
+               PrintAndLog("Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
+               ul_switch_off_field();
+               return UL_ERROR;
        }
        
-       // Magic UL-C, mine have a static nonce response to 0x1A command.
-       uint8_t nonce1[8] = {0,0,0,0,0,0,0,0};
-       uint8_t nonce2[8] = {0,0,0,0,0,0,0,0};
-       uint8_t status = requestAuthentication(nonce1);
-       if ( status ) {
-               requestAuthentication(nonce2);
-               if ( !memcmp(nonce1, nonce2, 8) ){
-                       tagtype = UL_C_MAGIC;
+       if ( card.uid[0] != 0x05) {
+
+               len  = ulev1_getVersion(version, sizeof(version));
+               if (len > -1) ul_switch_off_field();  //if -1 it is already off
+       
+               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[6] == 0x0F ) 
+                                       tagtype = NTAG_213;
+                               else if ( version[2] == 0x04 && version[6] == 0x11 ) 
+                                       tagtype = NTAG_215;     
+                               else if ( version[2] == 0x04 && version[6] == 0x13 ) 
+                                       tagtype = NTAG_216;
+                               else if ( version[2] == 0x04 ) 
+                                       tagtype = NTAG;
+                               
+                               break;
+                               }
+                       case 0x01: tagtype = UL_C; break;
+                       case 0x00: tagtype = UL; break;
+                       case -1  : tagtype = (UL | UL_C); break;  //when does this happen? -- if getversion fails, it assumes it is either UL/ULC
+                       default  : tagtype = UNKNOWN; break;
+               }
+               // UL-C test
+               if (tagtype == (UL | UL_C)) {
+                       status = ul_select(&card);
+                       if ( status < 1 ){
+                               PrintAndLog("iso14443a card select failed (UL-C)");
+                               ul_switch_off_field();
+                               return UL_ERROR;
+                       }
+                       uint8_t nonce[11] = {0x00};
+                       status = ulc_requestAuthentication(nonce, sizeof(nonce));
+                       tagtype = ( status > 0 ) ? UL_C : UL;
+
+                       if (status != -1) ul_switch_off_field();
                }
        } else {
-               //TODO: Magic Ultralight test here
+               // Infinition MY-D tests   Exam high nibble 
+               uint8_t nib = (card.uid[1] & 0xf0) >> 4;
+               switch ( nib ){
+                       case 1: tagtype =  MY_D; break;
+                       case 2: tagtype = (MY_D | MY_D_NFC); break;
+                       case 3: tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break;
+               }
        }
+       
+       tagtype = (ul_magic_test() == UL_MAGIC) ? (tagtype | MAGIC) : tagtype;
+       //if ((tagtype & UL)) tagtype = ul_magic_test();
+
        return tagtype;
 }      
 
 int CmdHF14AMfUInfo(const char *Cmd){
 
-       uint8_t datatemp[7] = {0x00};
-       uint8_t isOK  = 0;
+       uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
+       iso14a_card_select_t card;
        uint8_t *key;
+       int status;     
+       bool errors = false;
+       bool hasAuthKey = false;
+       uint8_t cmdp = 0;
+       uint8_t datalen = 0;
+       uint8_t authenticationkey[16] = {0x00};
+       uint8_t pack[4] = {0,0,0,0};
+                               
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       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;
+                       }
+                       errors = true; 
+                       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("\n--- Tag Information ---------");
        PrintAndLog("-------------------------------------------------------------");
+       ul_print_type(tagtype, 6);
+       
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("iso14443a card select failed");
+               ul_switch_off_field();
+               return status;
+       }
+       
+       if ( hasAuthKey ) {
+               if ((tagtype & UL_C)) 
+                       try3DesAuthentication(authenticationkey);
+               else
+                       ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
+       }
+       
+       // read pages 0,1,2,3 (should read 4pages)
+       status = ul_read(0, data, sizeof(data));
+       if ( status == -1 ){
+               PrintAndLog("Error: tag didn't answer to READ A");
+               return status;
+       }
 
-       if ( tagtype & UL )     
-               PrintAndLog("      TYPE : MIFARE Ultralight %s", (tagtype & MAGIC)?"(magic)":"");
-       else if ( tagtype & UL_C)
-               PrintAndLog("      TYPE : MIFARE Ultralight C %s", (tagtype & MAGIC)?"(magic)":"" );
-       else if ( tagtype & UL_EV1_48)
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 48 bytes"); 
-       else if ( tagtype & UL_EV1_128) 
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 128 bytes");
-       else 
-               PrintAndLog("      TYPE : Unknown %x",tagtype);
+       ul_print_default(data);
 
-       // read pages 0,1,2,4
-       UsbCommand c = {CMD_MIFAREU_READCARD, {0, 4}};
-       SendCommand(&c);
-       UsbCommand resp;
+       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");
+                       return status;
+               } 
+               ulc_print_configuration(ulc_conf);
 
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-               isOK  = resp.arg[0] & 0xff;
-               memcpy(data, resp.d.asBytes, sizeof(data));
+               if ((tagtype & MAGIC)){
+
+                       uint8_t ulc_deskey[16] = {0x00};
+                       status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
+                       if ( status == -1 ){
+                               PrintAndLog("Error: tag didn't answer to READ magic");
+                               return status;
+                       }
+                       ulc_print_3deskey(ulc_deskey);
 
-               if (!isOK) {
-                       PrintAndLog("Error reading from tag");
-                       return -1;
+               } else {
+                       // 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");
+                       ul_switch_off_field();
+                       for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
+                               key = default_3des_keys[i];
+                               if (try3DesAuthentication(key) == 1){
+                                       PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
+                                       uint8_t keySwap[16];
+                                       memcpy(keySwap, SwapEndian64(key,16,8), 16);
+                                       ulc_print_3deskey(keySwap);
+                                       return 1;
+                               }
+                       }
                }
-       } else {
-               PrintAndLog("Command execute timed out");
-               return -1;
        }
        
-       // UID
-       memcpy( datatemp, data, 3);
-       memcpy( datatemp+3, data+4, 4);
-       
-       PrintAndLog("       UID : %s ", sprint_hex(datatemp, 7));
-       PrintAndLog("      UID[0] (Manufacturer Byte) = %02x, Manufacturer: %s",  datatemp[0], getTagInfo(datatemp[0]) );
-       
-       // BBC
-       // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
-       int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
-       if ( data[3] == crc0 )
-               PrintAndLog("      BCC0 : %02x - Ok", data[3]);
-       else
-               PrintAndLog("      BCC0 : %02x - crc should be %02x", data[3], crc0);
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
+
+               ulev1_print_counters();
                
-       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 : %s ", sprint_hex(data + 9, 1));
-       
-       memcpy(datatemp, data+10, 2);
-       PrintAndLog("      Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
-       PrintAndLog("OneTimePad : %s ", sprint_hex(data + 3*4, 4));
-       PrintAndLog("");
-       
+               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");
+                       return status;
+               }               
+               ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+               
+               uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x25;
+               uint8_t ulev1_conf[16] = {0x00};
+               status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ EV1");
+                       return status;
+               }
+               // save AUTHENTICATION LIMITS for later:
+               authlim = (ulev1_conf[4] & 0x07);
+               bool allZeros = true;
+               for (uint8_t idx=0; idx<8; idx++)
+                       if (ulev1_conf[idx]) allZeros = false;
+
+               if (allZeros) authlim=7;
+               ulev1_print_configuration(ulev1_conf);
+       }
        
-       PrintAndLog("--- ");
-       if ( tagtype & UL_C ) {
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
+
+               uint8_t version[10] = {0x00};
+               status  = ulev1_getVersion(version, sizeof(version));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to GET_VERSION");
+                       return status;
+               }
+               ulev1_print_version(version);
+
+               // if we called info with key, just return 
+               if ( hasAuthKey ) return 1;
+               
+               // AUTHLIMIT, (number of failed authentications)
+               // 0 = limitless.
+               // 1-7 = ...  should we even try then?          
+               if ( authlim == 0 ){
+                       PrintAndLog("\n--- Known EV1/NTAG passwords.");
                
-               PrintAndLog("Trying some default 3des keys");
 
-               for (uint8_t i = 0; i < 5; ++i ){
-                       key = default_3des_keys[i];
-                       if (try3DesAuthentication(key)){
-                               PrintAndLog("Found default 3des key: %s", sprint_hex(key,16));
-                               return 0;
+                       int len=0; //if len goes to -1 the connection will be turned off.
+                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ){
+                               key = default_pwd_pack[i];
+                               if ( len > -1 ){
+                                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                                       PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                                       break;
+                               }
                        }
-               }               
+                       if (len > -1) ul_switch_off_field();
+               }
        }
-       else if ((tagtype & (UL_EV1_48 || UL_EV1_128))) {
-               //TODO
-               // --problem, there is a failed pwd tries counter in UL-EV1
-               //PrintAndLog("Trying some known EV1 passwords.");
+       
+       if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
+
+               uint8_t cc[16] = {0x00};
+               status = ul_read(3, cc, sizeof(cc));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ ntag");
+                       return status;
+               }
+               ntag_print_CC(cc);      
        }
        
-       // disconnect
-       // c.arg[0] = 0;
-       // c.arg[1] = 0;
-       // c.arg[2] = 0;
-       // SendCommand(&c);
-       return 0;
+       ul_switch_off_field();
+       PrintAndLog("");
+       return 1;
 }
 
 //
@@ -325,18 +879,40 @@ int CmdHF14AMfURdBl(const char *Cmd){
        return 0;
 }
 
+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("my-d, my-d NFC, my-d move, my-d move NFC\n");
+       PrintAndLog("Usage:  hf mfu info k <key>");
+       PrintAndLog("  Options : ");
+       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("");
+       PrintAndLog("   sample : hf mfu info");
+       PrintAndLog("          : hf mfu info k 11223344");
+       return 0;
+}
 
-int usage_hf_mfu_dump()
+int usage_hf_mfu_dump(void)
 {
        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
-       PrintAndLog("Usage:  hf mfu dump <filename w/o .bin>");
+       PrintAndLog("Usage:  hf mfu dump s k <key> n <filename w/o .bin>");
+       PrintAndLog("  Options : ");
+       PrintAndLog("  k <key> : Enter key for authentication");
+       PrintAndLog("  n <FN > : Enter filename w/o .bin to save the dump as"); 
+       PrintAndLog("        s : Swap entered key's endianness for auth");
+       PrintAndLog("");
        PrintAndLog("   sample : hf mfu dump");
-       PrintAndLog("          : hf mfu dump myfile");
-       PrintAndLog("          : hf mfu dump 1 myfile");
+       PrintAndLog("          : hf mfu dump myfile");
+       PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
        return 0;
 }
+
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
@@ -344,27 +920,72 @@ int usage_hf_mfu_dump()
 //  TODO: take a password to read UL-C / UL-EV1 tags.
 int CmdHF14AMfUDump(const char *Cmd){
 
-       char cmdp = param_getchar(Cmd, 0);
-       if (cmdp == 'h' || cmdp == 'H') 
-               return usage_hf_mfu_dump();
-       
        FILE *fout;
        char filename[FILE_PATH_SIZE] = {0x00};
        char * fnameptr = filename;
        char* str = "Dumping Ultralight%s%s Card Data...";      
-       
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
        uint8_t *lockbytes_t2 = NULL;
        uint8_t lockbytes2[2] = {0x00};
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
-       uint8_t data[176] = {0x00};
-       
+       uint8_t data[1024] = {0x00};
+       bool hasPwd = false;
        int i = 0;
        int Pages = 16;
        bool tmplockbit = false;
+       uint8_t dataLen=0;
+       uint8_t cmdp =0;
+       uint8_t key[16] = {0x00};
+       uint8_t *keyPtr = key;
+       size_t fileNlen = 0;
+       bool errors = false;
+       bool swapEndian = false;
+
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_hf_mfu_dump();
+               case 'k':
+               case 'K':
+                       dataLen = param_gethex(Cmd, cmdp+1, data, 32);
+                       if (dataLen) {
+                               errors = true; 
+                       } else {
+                               memcpy(key, data, 16);
+                       }   
+                       cmdp += 2;
+                       hasPwd = true;
+                       break;
+               case 'n':
+               case 'N':
+                       fileNlen = param_getstr(Cmd, cmdp+1, filename);
+                       if (!fileNlen) errors = true; 
+                       if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
+                       cmdp += 2;
+                       break;
+               case 's':
+                       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_dump();
        
+       if (swapEndian)
+               keyPtr = SwapEndian64(data, 16, 8);
+
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
        
@@ -388,21 +1009,26 @@ int CmdHF14AMfUDump(const char *Cmd){
                PrintAndLog("Dumping unknown Ultralight, using default values.");
        }
        
-       UsbCommand c = {CMD_MIFAREU_READCARD, {0,Pages}};
+       UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}};
+       if ( hasPwd ) {
+               c.arg[2] = 1;
+               memcpy(c.d.asBytes, key, 16);
+       }
        SendCommand(&c);
        UsbCommand resp;
-
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
                PrintAndLog("Command execute time-out");
-               return 0;
+               return 1;
        }
-               
-       if (!resp.arg[0] ) {                
-               PrintAndLog("Read command failed");
-               return 0;
-       }               
-       memcpy(data, resp.d.asBytes, sizeof(data));
-       
+       PrintAndLog     ("%u,%u",resp.arg[0],resp.arg[1]);
+       uint8_t isOK = resp.arg[0] & 0xff;
+       if (isOK) {
+               memcpy(data, resp.d.asBytes, resp.arg[1]);
+       } else {
+               PrintAndLog("Failed reading block: (%02x)", i);
+               return 1;
+       }
+
        // Load lock bytes.
        int j = 0;
        
@@ -415,7 +1041,6 @@ int CmdHF14AMfUDump(const char *Cmd){
        
        // Load bottom lockbytes if available
        if ( Pages == 44 ) {
-               
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
                lockbytes2[1] = lockbytes_t2[3];
@@ -424,13 +1049,16 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
+       // add keys
+       if (hasPwd){
+               memcpy(data + Pages*4, key, 16);
+               Pages += 4;
+       }
        for (i = 0; i < Pages; ++i) {
-               
                if ( i < 3 ) {
                        PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
                        continue;
                }
-
                switch(i){
                        case 3: tmplockbit = bit[4]; break;
                        case 4: tmplockbit = bit[3]; break;
@@ -478,15 +1106,13 @@ int CmdHF14AMfUDump(const char *Cmd){
                PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
        }  
        
-       int len = param_getstr(Cmd,0,filename);
-       if (len > FILE_PATH_SIZE-5) 
-               len = FILE_PATH_SIZE-5;
-
-       if (len < 1) {
+       // 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]);
        } else {
-               sprintf(fnameptr + len," .bin");
+               sprintf(fnameptr + fileNlen,".bin");
        }
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
@@ -526,7 +1152,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);
-               if(keyNo > 6
+               if(keyNo > KEYS_3DES_COUNT
                        errors = true;
        }
 
@@ -548,8 +1174,8 @@ int CmdHF14AMfucAuth(const char *Cmd){
        } 
 
        uint8_t *key = default_3des_keys[keyNo];
-       if (try3DesAuthentication(key))
-               PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 8));
+       if (try3DesAuthentication(key)>0)
+               PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");
                        
@@ -558,7 +1184,6 @@ int CmdHF14AMfucAuth(const char *Cmd){
 
 int try3DesAuthentication( uint8_t *key){
        
-       uint8_t blockNo = 0;
        uint32_t cuid = 0;
 
        des3_context ctx = { 0 };
@@ -569,7 +1194,7 @@ int try3DesAuthentication( uint8_t *key){
        uint8_t rnd_ab[16] = { 0 };
        uint8_t iv[8] = { 0 };
 
-       UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
+       UsbCommand c = {CMD_MIFAREUC_AUTH1, {0x00}};
        SendCommand(&c);
        UsbCommand resp;
        if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) )    return -1;
@@ -585,7 +1210,12 @@ int try3DesAuthentication( uint8_t *key){
        rol(random_b,8);
        memcpy(rnd_ab  ,random_a,8);
        memcpy(rnd_ab+8,random_b,8);
-
+       
+       //PrintAndLog("      RndA  :%s", sprint_hex(random_a, 8));
+       //PrintAndLog("  enc(RndB) :%s", sprint_hex(enc_random_b, 8));
+       //PrintAndLog("       RndB :%s", sprint_hex(random_b, 8));
+       //PrintAndLog("        A+B :%s", sprint_hex(rnd_ab, 16));
+       
        des3_set2key_enc(&ctx, key);
        // context, mode, length, IV, input, output 
        des3_crypt_cbc(&ctx, DES_ENCRYPT, sizeof(rnd_ab), enc_random_b, rnd_ab, rnd_ab);
@@ -607,16 +1237,12 @@ int try3DesAuthentication( uint8_t *key){
        // context, mode, length, IV, input, output
        des3_crypt_cbc( &ctx, DES_DECRYPT, 8, enc_random_b, enc_resp, resp_random_a);
 
+       //PrintAndLog("   enc(A+B) :%s", sprint_hex(rnd_ab, 16));
+       //PrintAndLog(" enc(RndA') :%s", sprint_hex(enc_resp, 8));
+
        if ( !memcmp(resp_random_a, random_a, 8))
                return 1;       
        return 0;
-       
-       //PrintAndLog("      RndA  :%s", sprint_hex(random_a, 8));
-       //PrintAndLog("  enc(RndB) :%s", sprint_hex(enc_random_b, 8));
-       //PrintAndLog("       RndB :%s", sprint_hex(random_b, 8));
-       //PrintAndLog("        A+B :%s", sprint_hex(random_a_and_b, 16));
-       //PrintAndLog("   enc(A+B) :%s", sprint_hex(random_a_and_b, 16));
-       //PrintAndLog(" enc(RndA') :%s", sprint_hex(data2+1, 8));
 }
 
 /**
@@ -715,6 +1341,7 @@ int CmdTestDES(const char * cmd)
        return 0;       
 }
 **/
+
 //
 // Ultralight C Read Single Block
 //
@@ -723,14 +1350,14 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
        UsbCommand resp;
        bool hasPwd = FALSE;
        uint8_t blockNo = -1;
-       unsigned char key[16];
+       uint8_t key[16];
        char cmdp = param_getchar(Cmd, 0);
        
        if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  hf mfu crdbl  <block number> <password>");
+               PrintAndLog("Usage:  hf mfu crdbl  <block number> <key>");
                PrintAndLog("");
                PrintAndLog("sample: hf mfu crdbl 0");
-               PrintAndLog("        hf mfu crdbl 0 112233445566778899AABBCCDDEEFF");
+               PrintAndLog("        hf mfu crdbl 0 00112233445566778899AABBCCDDEEFF");
                return 0;
        }       
                
@@ -819,6 +1446,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
        if ( blockNo <= 3 ) {
                if (!chinese_card){
                         PrintAndLog("Access Denied");  
+                       return 1;
                } else {
                        PrintAndLog("--Special block no: 0x%02x", blockNo);
                        PrintAndLog("--Data: %s", sprint_hex(bldata, 4));
@@ -830,6 +1458,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk:%02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
+                               return 1;
                        }  
                }       
        } else {
@@ -843,6 +1472,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk : %02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
+                               return 1;
                        }
        }
        return 0;
@@ -854,6 +1484,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
        uint8_t pwd[16] = {0x00};       
+       
        char cmdp = param_getchar(Cmd, 0);
        
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
@@ -886,6 +1517,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
        }
        else {
                PrintAndLog("command execution time out");
+               return 1;
        }
        
        return 0;
@@ -1094,4 +1726,4 @@ int CmdHFMFUltra(const char *Cmd){
 int CmdHelp(const char *Cmd){
        CmdsHelp(CommandTable);
        return 0;
-}
\ No newline at end of file
+}
Impressum, Datenschutz