]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
CHG: the name change from "HF 14A SNOOP" -> "HF 14A SNIFF"
[proxmark3-svn] / client / cmdhfmfu.c
index 3f4b730bad3bac38aa95e2c286b603d161bcd34a..d905ec82afd7a0be6741b1f6ec9cefd6346bf49e 100644 (file)
 
 #define MAX_UL_BLOCKS          0x0f
 #define MAX_ULC_BLOCKS         0x2f
-#define MAX_ULEV1a_BLOCKS      0x0b
+#define MAX_ULEV1a_BLOCKS   0x12
 #define MAX_ULEV1b_BLOCKS      0x20
 #define MAX_NTAG_213           0x2c
 #define MAX_NTAG_215           0x86
-#define MAX_NTAG_216      0xe6
-
-typedef enum TAGTYPE_UL {
-       UNKNOWN         = 0x0000,
-       UL              = 0x0001,
-       UL_C            = 0x0002,
-       UL_EV1_48       = 0x0004,
-       UL_EV1_128      = 0x0008,
-       NTAG            = 0x0010,
-       NTAG_213        = 0x0020,
-       NTAG_215        = 0x0040,
-       NTAG_216        = 0x0080,
-       MY_D                    = 0x0100,
-       MY_D_NFC                = 0x0200,       
-       MY_D_MOVE               = 0x0400,
-       MY_D_MOVE_NFC   = 0x0800,
-       MAGIC           = 0x1000,
-       UL_MAGIC                = UL | MAGIC,
-       UL_C_MAGIC              = UL_C | MAGIC,
-       UL_ERROR                = 0xFFFF,
-} TagTypeUL_t;
+#define MAX_NTAG_216        0xe6
 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
@@ -51,22 +31,33 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
                { 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
                { 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
                { 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
+               { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF },    // 11 22 33
        };
 
-#define KEYS_PWD_COUNT 8
+#define KEYS_PWD_COUNT 10
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
+       
        {0x4A,0xF8,0x4B,0x19}, // PACK 0xE5,0xBE -- italian bus (sniffed)
        {0x33,0x6B,0xA1,0x19}, // PACK 0x9c,0x2d -- italian bus (sniffed)
        {0xFF,0x90,0x6C,0xB2}, // PACK 0x12,0x9e -- italian bus (sniffed)       
+       {0x46,0x1c,0xA3,0x19}, // PACK 0xE9,0x5A -- italian bus (sniffed)
+       {0x35,0x1C,0xD0,0x19}, // PACK 0x9A,0x5a -- italian bus (sniffed)
+       
        {0x05,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- Amiiboo (sniffed) pikachu-b UID:
        {0x7E,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
        {0x02,0xE1,0xEE,0x36}, // PACK 0x80,0x80 -- AMiiboo (sniffed) sonic UID:  04d257 7ae33e8027
        {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
-
 };     
        
+#define MAX_UL_TYPES 13
+uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, 
+           NTAG, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC};
+uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, 
+           MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_213, MAX_NTAG_213, MAX_NTAG_215,
+           MAX_NTAG_216, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS};
+
+
 static int CmdHelp(const char *Cmd);
 
 char* getProductTypeStr( uint8_t id){
@@ -115,7 +106,7 @@ static void ul_switch_on_field(void) {
        SendCommand(&c);
 }
 
-static void ul_switch_off_field(void) {
+void ul_switch_off_field(void) {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
 }
@@ -191,15 +182,27 @@ static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
        return -1;      
 }
 
-static int ulc_requestAuthentication( uint8_t blockNo, uint8_t *nonce, uint16_t nonceLength ){
+static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
        
-       uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};
+       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 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 -1;
+       if ( resp.arg[0] == 1 ) return 0;
+       
+       return -2;
+}
+
 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]};
@@ -238,6 +241,15 @@ static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t respo
        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};
@@ -259,7 +271,7 @@ 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]) );
+       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){
@@ -282,11 +294,16 @@ static int ul_print_default( uint8_t *data){
                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) );
 
-       // if Page3 has NDEF magic number, its not a OTP..
-       if ( data[12] != 0xE1 )
-               PrintAndLog("OneTimePad : %s\n", sprint_hex(data + 12, 4));
+       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;
 }
@@ -296,7 +313,7 @@ static int ntag_print_CC(uint8_t *data) {
        PrintAndLog("\n--- NTAG NDEF Message");
        
        if(data[0] != 0xe1) {
-               PrintAndLog("no NDEF message found");
+               PrintAndLog("no NDEF message");
                return -1;              // no NDEF message
        }
 
@@ -317,31 +334,35 @@ static int ntag_print_CC(uint8_t *data) {
        return 0;                               
 }
 
-static int ul_print_type(uint16_t tagtype){
+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("      TYPE : MIFARE Ultralight (MF0ICU1) %s", (tagtype & MAGIC)?"<magic>":"");
+               PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
        else if ( tagtype & UL_C)
-               PrintAndLog("      TYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", (tagtype & MAGIC)?"<magic>":"", tagtype );
+               PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
        else if ( tagtype & UL_EV1_48)
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)"); 
+               PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
        else if ( tagtype & UL_EV1_128) 
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)");
+               PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
        else if ( tagtype & NTAG_213 )
-               PrintAndLog("      TYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)");
+               PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
        else if ( tagtype & NTAG_215 )
-               PrintAndLog("      TYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)");
+               PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
        else if ( tagtype & NTAG_216 )
-               PrintAndLog("      TYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)");
+               PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
        else if ( tagtype & MY_D )
-               PrintAndLog("      TYPE : INFINEON my-d\x99");  
+               PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
        else if ( tagtype & MY_D_NFC )
-               PrintAndLog("      TYPE : INFINEON my-d\x99 NFC");
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
        else if ( tagtype & MY_D_MOVE )
-               PrintAndLog("      TYPE : INFINEON my-d\x99 move");
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
        else if ( tagtype & MY_D_MOVE_NFC )
-               PrintAndLog("      TYPE :  INFINEON my-d\x99 move NFC");
+               PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
        else
-               PrintAndLog("      TYPE : Unknown %04x",tagtype);       
+               PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);
        return 0;
 }
 
@@ -350,8 +371,7 @@ static int ulc_print_3deskey( uint8_t *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), 16));
+       PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
        return 0;
 }
 
@@ -363,7 +383,7 @@ static int ulc_print_configuration( uint8_t *data){
 
        bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
        if ( validAuth )
-               PrintAndLog("           Auth0 [42/0x2A]: %s Pages above %d/0x%02X needs authentication", sprint_hex(data+8, 4), data[8],data[8] );
+               PrintAndLog("           Auth0 [42/0x2A]: %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
        else{
                if ( data[8] == 0){
                        PrintAndLog("           Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );
@@ -390,7 +410,7 @@ static int ulev1_print_configuration( uint8_t *data){
         
        PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));
        if ( data[3] < 0xff )
-               PrintAndLog("                    - pages above %d needs authentication",data[3]);
+               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");
@@ -409,10 +429,13 @@ static int ulev1_print_configuration( uint8_t *data){
 
 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;
 }
@@ -441,6 +464,7 @@ static int ulev1_print_version(uint8_t *data){
        return 0;
 }
 
+/*
 static int ulc_magic_test(){
        // Magic Ultralight test
                // Magic UL-C, by observation,
@@ -458,9 +482,9 @@ static int ulc_magic_test(){
                ul_switch_off_field();
                return UL_ERROR;
        }
-       status = ulc_requestAuthentication(0, nonce1, sizeof(nonce1));
+       status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
        if ( status > 0 ) {
-               status = ulc_requestAuthentication(0, nonce2, sizeof(nonce2));
+               status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
                returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
        } else {
                returnValue = UL;
@@ -468,7 +492,7 @@ static int ulc_magic_test(){
        ul_switch_off_field();
        return returnValue;
 }
-
+*/
 static int ul_magic_test(){
        
        // Magic Ultralight tests
@@ -477,13 +501,13 @@ static int ul_magic_test(){
        iso14a_card_select_t card;
        int status = ul_select(&card);
        if ( status < 1 ){
-               PrintAndLog("Error: couldn't select ul_magic_test");
+               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) 
+       if ( status == 0 
                return UL_MAGIC;
        return UL;
 }
@@ -498,13 +522,13 @@ uint16_t GetHF14AMfU_Type(void){
 
        status = ul_select(&card);
        if ( status < 1 ){
-               PrintAndLog("Error: couldn't select");
+               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);
+               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;
        }
@@ -535,10 +559,23 @@ uint16_t GetHF14AMfU_Type(void){
                        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;
+                       default  : tagtype = UNKNOWN; break;
                }
-       }
-       else {          
+               // 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 {
                // Infinition MY-D tests   Exam high nibble 
                uint8_t nib = (card.uid[1] & 0xf0) >> 4;
                switch ( nib ){
@@ -548,8 +585,8 @@ uint16_t GetHF14AMfU_Type(void){
                }
        }
        
-       if ((tagtype & ( UL_C | UL ))) tagtype = ulc_magic_test();
-       if ( (tagtype & UL) ) tagtype = ul_magic_test();
+       tagtype = (ul_magic_test() == UL_MAGIC) ? (tagtype | MAGIC) : tagtype;
+       //if ((tagtype & UL)) tagtype = ul_magic_test();
 
        return tagtype;
 }      
@@ -561,27 +598,90 @@ int CmdHF14AMfUInfo(const char *Cmd){
        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};
+       int len=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("-------------------------------------------------------------");
-
-       ul_print_type(tagtype);
+       ul_print_type(tagtype, 6);
        
        status = ul_select(&card);
        if ( status < 1 ){
-               PrintAndLog("Error: couldn't select");
+               PrintAndLog("iso14443a card select failed");
                ul_switch_off_field();
                return status;
        }
        
-       // read pages 0,1,2,3 (should read 4pages)
+       if ( hasAuthKey ) {
+               if ((tagtype & UL_C)) {
+                       ul_switch_off_field();
+                       //will select card automatically
+                       if (ulc_authentication(authenticationkey, false) != 1) {
+                               ul_switch_off_field();
+                               PrintAndLog("Error: Authentication Failed UL-C");
+                               return 0;
+                       }
+               } else {
+                       len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
+                       if (len < 1) {
+                               if (!len) ul_switch_off_field();
+                               PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
+                               return 0;
+                       }
+               }
+       }
+
+
+       // read pages 0,1,2,4 (should read 4pages)
        status = ul_read(0, data, sizeof(data));
        if ( status == -1 ){
                PrintAndLog("Error: tag didn't answer to READ A");
-               ul_switch_off_field();
                return status;
        }
 
@@ -593,11 +693,9 @@ int CmdHF14AMfUInfo(const char *Cmd){
                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 - possibly locked");
-                       ul_switch_off_field();
+                       PrintAndLog("Error: tag didn't answer to READ UL-C");
                        return status;
                } 
-
                ulc_print_configuration(ulc_conf);
 
                if ((tagtype & MAGIC)){
@@ -606,22 +704,28 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
                        if ( status == -1 ){
                                PrintAndLog("Error: tag didn't answer to READ magic");
-                               ul_switch_off_field();
                                return status;
                        }
                        ulc_print_3deskey(ulc_deskey);
 
                } 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();
+                       ul_switch_off_field(); //will select again in try3DesAuth...
                        for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
                                key = default_3des_keys[i];
-                               if (try3DesAuthentication(key) == 1){
+                               if (ulc_authentication(key, true) == 0){
                                        PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
-                                       ulc_print_3deskey(SwapEndian64(key,16));
-                                       return 0;
+                                       uint8_t keySwap[16];
+                                       memcpy(keySwap, SwapEndian64(key,16,8), 16);
+                                       ulc_print_3deskey(keySwap);
+                                       return 1;
                                }
                        }
+                       return 1; //return even if key not found (UL_C is done)
                }
        }
        
@@ -633,7 +737,6 @@ int CmdHF14AMfUInfo(const char *Cmd){
                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;
                }               
                ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
@@ -642,12 +745,16 @@ int CmdHF14AMfUInfo(const char *Cmd){
                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 - possibly locked");
-                       ul_switch_off_field();
-                       //return status;
+                       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);
        }
        
@@ -657,27 +764,30 @@ int CmdHF14AMfUInfo(const char *Cmd){
                status  = ulev1_getVersion(version, sizeof(version));
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to GET_VERSION");
-                       ul_switch_off_field();
                        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?
-               authlim = 1;
+               // 1-7 = ...  should we even try then?          
                if ( authlim == 0 ){
                        PrintAndLog("\n--- Known EV1/NTAG passwords.");
                
-                       uint8_t pack[4] = {0,0,0,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 ( ulev1_requestAuthentication(key, pack, sizeof(pack)) > -1 ){
+                               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;
                                }
                        }
-                       ul_switch_off_field();
+                       if (len > -1) ul_switch_off_field();
                }
        }
        
@@ -687,7 +797,6 @@ int CmdHF14AMfUInfo(const char *Cmd){
                status = ul_read(3, cc, sizeof(cc));
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to READ ntag");
-                       ul_switch_off_field();
                        return status;
                }
                ntag_print_CC(cc);      
@@ -695,7 +804,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
        
        ul_switch_off_field();
        PrintAndLog("");
-       return 0;
+       return 1;
 }
 
 //
@@ -809,21 +918,43 @@ 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(void)
 {
        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
-       PrintAndLog("Usage:  hf mfu dump k <key> n <filename w/o .bin>");
+       PrintAndLog("Usage:  hf mfu dump l k <key> n <filename w/o .bin> p <> q <>");
        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("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : swap entered key's endianness for auth");
+       PrintAndLog("  n <FN > : filename w/o .bin to save the dump as");       
+       PrintAndLog("  p <Pg > : starting Page number to manually set a page to start the dump at");    
+       PrintAndLog("  q <qty> : number of Pages to manually set how many pages to dump");      
+
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
+       PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
        return 0;
 }
+
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
@@ -834,7 +965,6 @@ int CmdHF14AMfUDump(const char *Cmd){
        FILE *fout;
        char filename[FILE_PATH_SIZE] = {0x00};
        char * fnameptr = filename;
-       char* str = "Dumping Ultralight%s%s Card Data...";      
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
        uint8_t *lockbytes_t2 = NULL;
@@ -843,6 +973,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        bool bit2[16] = {0x00};
        uint8_t data[1024] = {0x00};
        bool hasPwd = false;
+       bool hasKey = false;
        int i = 0;
        int Pages = 16;
        bool tmplockbit = false;
@@ -853,6 +984,9 @@ int CmdHF14AMfUDump(const char *Cmd){
        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;
+       bool manualPages = false;
+       uint8_t startPage = 0;
+       char tempStr[50];
 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
@@ -863,14 +997,24 @@ int CmdHF14AMfUDump(const char *Cmd){
                        return usage_hf_mfu_dump();
                case 'k':
                case 'K':
-                       dataLen = param_gethex(Cmd, cmdp+1, data, 32);
-                       if (dataLen) {
+                       dataLen = param_getstr(Cmd, cmdp+1, tempStr);
+                       if (dataLen == 32) {
+                               errors = param_gethex(tempStr, 0, key, dataLen);
+                               hasKey = true;
+                       }
+                       else if (dataLen == 8) {
+                               errors = param_gethex(tempStr, 0, key, dataLen);
+                               hasPwd = true;
+                       }
+                       else
                                errors = true; 
-                       } else {
-                               memcpy(key, data, 16);
-                       }   
+                               
                        cmdp += 2;
-                       hasPwd = true;
+                       break;
+               case 'l':
+               case 'L':
+                       swapEndian = true;
+                       cmdp++;
                        break;
                case 'n':
                case 'N':
@@ -879,9 +1023,17 @@ int CmdHF14AMfUDump(const char *Cmd){
                        if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
                        cmdp += 2;
                        break;
-               case 's':
-                       swapEndian = true;
-                       cmdp++;
+               case 'p':
+               case 'P':
+                       startPage = param_get8(Cmd, cmdp+1);
+                       manualPages = true;
+                       cmdp += 2;
+                       break;
+               case 'q':
+               case 'Q':
+                       Pages = param_get8(Cmd, cmdp+1);
+                       cmdp += 2;
+                       manualPages = true;
                        break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -894,37 +1046,31 @@ int CmdHF14AMfUDump(const char *Cmd){
        //Validations
        if(errors) return usage_hf_mfu_dump();
        
-       if (swapEndian)
-               keyPtr = SwapEndian64(data, 16);
+       //if (swapEndian && hasKey )
+       //      keyPtr = SwapEndian64(data, 16, 8);
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
        
-       if ( tagtype & UL ) {
-               Pages = 16;
-               PrintAndLog(str,"", (tagtype & MAGIC)?" (magic)":"" );
-       }
-       else if ( tagtype & UL_C ) {
-               Pages = 44;
-               PrintAndLog(str,"-C", (tagtype & MAGIC)?" (magic)":"" );
-       }
-       else if ( tagtype & UL_EV1_48 ) {
-               Pages = 18; 
-               PrintAndLog(str," EV1_48","");
-       }
-       else if ( tagtype & UL_EV1_128 ) {
-               Pages = 32; 
-               PrintAndLog(str," EV1_128","");
-       } else {
-               Pages = 16;
-               PrintAndLog("Dumping unknown Ultralight, using default values.");
-       }
+       if (!manualPages)
+               for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
+                       if (tagtype & UL_TYPES_ARRAY[idx])
+                               Pages = UL_MEMORY_ARRAY[idx]+1;
+
+       ul_print_type(tagtype, 0);
+       PrintAndLog("Reading tag memory...");
+
+       UsbCommand c = {CMD_MIFAREUC_READCARD, {startPage, Pages}};
        
-       UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}};
-       if ( hasPwd ) {
-               c.arg[2] = 1;
+       if ( hasKey ) { 
+               c.arg[2] = 1; 
                memcpy(c.d.asBytes, key, 16);
        }
+       if ( hasPwd ) { 
+               c.arg[2] = 2;
+               memcpy(c.d.asBytes, key, 4);
+       }
+       
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
@@ -951,6 +1097,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        }               
        
        // Load bottom lockbytes if available
+       // HOW DOES THIS APPLY TO EV1 and/or NTAG???
        if ( Pages == 44 ) {
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
@@ -960,11 +1107,19 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
-       // add keys
-       if (hasPwd){
+       // add keys UL_C
+       if (hasKey ){ 
                memcpy(data + Pages*4, key, 16);
                Pages += 4;
        }
+       // add keys ULEV1 / NTAG
+       if (hasPwd ){ 
+               memcpy(data + Pages*4, key, 4);
+               Pages += 1;
+       }
+       
+       //TODO add key MEM location for other tags
+
        for (i = 0; i < Pages; ++i) {
                if ( i < 3 ) {
                        PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
@@ -1023,7 +1178,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                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 + fileNlen," .bin");
+               sprintf(fnameptr + fileNlen,".bin");
        }
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
@@ -1037,14 +1192,14 @@ int CmdHF14AMfUDump(const char *Cmd){
        return 0;
 }
 
-// Needed to Authenticate to Ultralight C tags
-void rol (uint8_t *data, const size_t len){
-       uint8_t first = data[0];
-       for (size_t i = 0; i < len-1; i++) {
-               data[i] = data[i+1];
-       }
-       data[len-1] = first;
-}
+// // Needed to Authenticate to Ultralight C tags
+// void rol (uint8_t *data, const size_t len){
+       // uint8_t first = data[0];
+       // for (size_t i = 0; i < len-1; i++) {
+               // data[i] = data[i+1];
+       // }
+       // data[len-1] = first;
+// }
 
 //-------------------------------------------------------------------------------
 // Ultralight C Methods
@@ -1085,7 +1240,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
        } 
 
        uint8_t *key = default_3des_keys[keyNo];
-       if (try3DesAuthentication(key)>0)
+       if (ulc_authentication(key, true) == 0)
                PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");
@@ -1093,69 +1248,6 @@ int CmdHF14AMfucAuth(const char *Cmd){
        return 0;
 }
 
-int try3DesAuthentication( uint8_t *key){
-       
-       uint8_t blockNo = 0;
-       uint32_t cuid = 0;
-
-       des3_context ctx = { 0 };
-       
-       uint8_t random_a[8] = { 1,1,1,1,1,1,1,1 };
-       uint8_t random_b[8] = { 0 };
-       uint8_t enc_random_b[8] = { 0 };
-       uint8_t rnd_ab[16] = { 0 };
-       uint8_t iv[8] = { 0 };
-
-       UsbCommand c = {CMD_MIFAREUC_AUTH1, {blockNo}};
-       SendCommand(&c);
-       UsbCommand resp;
-       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) )    return -1;
-       if ( !(resp.arg[0] & 0xff) ) return -2;
-       
-       cuid  = resp.arg[1];    
-       memcpy(enc_random_b,resp.d.asBytes+1,8);
-
-       des3_set2key_dec(&ctx, key);
-       // context, mode, length, IV, input, output 
-       des3_crypt_cbc( &ctx, DES_DECRYPT, sizeof(random_b), iv , enc_random_b , random_b);
-
-       rol(random_b,8);
-       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);
-
-       //Auth2
-       c.cmd = CMD_MIFAREUC_AUTH2;
-       c.arg[0] = cuid;
-       memcpy(c.d.asBytes, rnd_ab, 16);
-       SendCommand(&c);
-
-       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;                          
-       if ( !(resp.arg[0] & 0xff)) return -2;
-       
-       uint8_t enc_resp[8] = { 0 };
-       uint8_t resp_random_a[8] = { 0 };
-       memcpy(enc_resp, resp.d.asBytes+1, 8);
-
-       des3_set2key_dec(&ctx, key);
-       // context, mode, length, IV, input, output
-       des3_crypt_cbc( &ctx, DES_DECRYPT, 8, enc_random_b, enc_resp, resp_random_a);
-
-       //PrintAndLog("   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;
-}
 
 /**
 A test function to validate that the polarssl-function works the same 
Impressum, Datenschutz