ADD: another default key: VIGIK1

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 78ce1ea0b2a0f3cf867d6a88288b30f578f467a7..89add72329ff4248d7a123299824cf8ee074b43d 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -39,7 +39,8 @@ typedef enum TAGTYPE_UL {
        UL_ERROR        = 0xFFFF,
 } TagTypeUL_t;
 
        UL_ERROR        = 0xFFFF,
 } TagTypeUL_t;
 

-uint8_t default_3des_keys[7][16] = {
+#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
                { 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


@@ -48,6 +49,19 @@ 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
        };
                { 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);
 
        
 static int CmdHelp(const char *Cmd);
 


@@ -106,18 +120,15 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
        memcpy(c.d.asBytes, cmd, cmdlen);
        SendCommand(&c);
        UsbCommand resp;
        memcpy(c.d.asBytes, cmd, cmdlen);
        SendCommand(&c);
        UsbCommand resp;

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

        
        

-       if (resp.arg[0] > 0) {
-               uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-               memcpy(response, resp.d.asBytes, resplen);
-               return resplen;
-       } 
-       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 ) {
 }
 /*
 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;
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT , cmdlen, 0}};
        if (append_crc)
                c.arg[0] |= ISO14A_APPEND_CRC;


@@ -126,12 +137,11 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
        SendCommand(&c);
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
        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;
 
        uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;

-       if (resp.arg[0] > 0) {

                memcpy(response, resp.d.asBytes, resplen );
        return resplen;
                memcpy(response, resp.d.asBytes, resplen );
        return resplen;

-       } else return -1;

 }
 */
 static int ul_select( iso14a_card_select_t *card ){
 }
 */
 static int ul_select( iso14a_card_select_t *card ){


@@ -140,10 +150,9 @@ static int ul_select( iso14a_card_select_t *card ){
 
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
 
        UsbCommand resp;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;

-       if (resp.arg[0] < 0) return -1;
+       if (resp.arg[0] < 1) return -1;

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

-       

        return resp.arg[0];
 }
 
        return resp.arg[0];
 }
 


@@ -157,6 +166,26 @@ static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
        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 blockNo, uint8_t *nonce, uint16_t nonceLength ){
        
        uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};
 static int ulc_requestAuthentication( uint8_t blockNo, uint8_t *nonce, uint16_t nonceLength ){
        
        uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};


@@ -272,9 +301,9 @@ static int ntag_print_CC(uint8_t *data) {
        return 0;                               
 }
 
        return 0;                               
 }
 

-static int ul_print_version(uint8_t *data){            
+static int ulev1_print_version(uint8_t *data){         

        PrintAndLog("\n--- UL-EV1 / NTAG Version");
        PrintAndLog("\n--- UL-EV1 / NTAG Version");

-       PrintAndLog("Raw version bytes: %s", sprint_hex(data, 8) );
+       PrintAndLog("       Raw bytes : %s", sprint_hex(data, 8) );

        PrintAndLog("       Vendor ID : 0x%02X, Manufacturer: %s", data[1], getTagInfo(data[1]));
        PrintAndLog("    Product type : %s"             , getProductTypeStr(data[2]));
        PrintAndLog(" Product subtype : 0x%02X %s"      , data[3], (data[3]==1) ?"17 pF":"50pF");
        PrintAndLog("       Vendor ID : 0x%02X, Manufacturer: %s", data[1], getTagInfo(data[1]));
        PrintAndLog("    Product type : %s"             , getProductTypeStr(data[2]));
        PrintAndLog(" Product subtype : 0x%02X %s"      , data[3], (data[3]==1) ?"17 pF":"50pF");


@@ -306,10 +335,10 @@ static int ul_print_type(uint16_t tagtype){
 }
 
 static int ulc_print_3deskey( uint8_t *data){                  
 }
 
 static int ulc_print_3deskey( uint8_t *data){                  

-       PrintAndLog("         deskey1 [44/0x2C]: %s", sprint_hex(data   ,4));
-       PrintAndLog("         deskey1 [45/0x2D]: %s", sprint_hex(data+4 ,4));                   
-       PrintAndLog("         deskey2 [46/0x2E]: %s", sprint_hex(data+8 ,4));
-       PrintAndLog("         deskey2 [47/0x2F]: %s", sprint_hex(data+12,4));
+       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(" 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
        return 0;
 }
        PrintAndLog(" 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
        return 0;
 }


@@ -368,13 +397,13 @@ static int ulev1_print_counters(){
        uint8_t counter[3] = {0,0,0};
        for ( uint8_t i = 0; i<3; ++i) {
                ulev1_readCounter(i,counter, sizeof(counter) );
        uint8_t counter[3] = {0,0,0};
        for ( uint8_t i = 0; i<3; ++i) {
                ulev1_readCounter(i,counter, sizeof(counter) );

-               PrintAndLog("Counter [%d] : %s", i, sprint_hex(counter,3));
+               PrintAndLog("     [0x%0d] : %s", i, sprint_hex(counter,3));

        }
        return 0;
 }
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
        }
        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("IC signature public key name  : NXP NTAG21x 2013");
        PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
        PrintAndLog("    Elliptic curve parameters : secp128r1");


@@ -384,13 +413,58 @@ static int ulev1_print_signature( uint8_t *data, uint8_t len){
        return 0;
 }
 
        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(0, nonce1, sizeof(nonce1));
+       if ( status > 0 ) {
+               status = ulc_requestAuthentication(0, 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;
+       int status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("Error: couldn't select ul_magic_test");
+               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;
+}
+

 uint16_t GetHF14AMfU_Type(void){
 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;
        uint8_t version[10] = {0x00};
 uint16_t GetHF14AMfU_Type(void){
 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;
        uint8_t version[10] = {0x00};

-       uint8_t nonce1[11] = {0x00};
-       uint8_t nonce2[11] = {0x00};

        int status = 0;
        int len;
 
        int status = 0;
        int len;
 


@@ -400,9 +474,9 @@ uint16_t GetHF14AMfU_Type(void){
                ul_switch_off_field();
                return UL_ERROR;
        }
                ul_switch_off_field();
                return UL_ERROR;
        }

-

        // Ultralight - ATQA / SAK 
        // Ultralight - ATQA / SAK 

-       if ( card.atqa[1] != 0x00 && card.atqa[0] != 0x44 && card.sak != 0x00 ) {
+       if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
+               PrintAndLog("Tag is not UL or NTAG. [ATQA: %02X %02x SAK: %02X]", card.atqa[1],card.atqa[0],card.sak);

                ul_switch_off_field();
                return UL_ERROR;
        }
                ul_switch_off_field();
                return UL_ERROR;
        }


@@ -411,18 +485,15 @@ uint16_t GetHF14AMfU_Type(void){
        ul_switch_off_field();
        
        switch (len) {
        ul_switch_off_field();
        
        switch (len) {

-               case -1:
-                       tagtype = (UL | UL_C);
-                       break;

                case 0x0A: {
                
                        if ( version[2] == 0x03 && version[6] == 0x0B ) 
                                tagtype = UL_EV1_48;
                        else if ( version[2] == 0x03 && version[6] != 0x0B ) 
                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;                   
+                               tagtype = UL_EV1_128;                                   

                        else if ( version[2] == 0x04 && version[6] == 0x0F ) 
                                tagtype = NTAG_213;
                        else if ( version[2] == 0x04 && version[6] == 0x0F ) 
                                tagtype = NTAG_213;

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

                                tagtype = NTAG_215;     
                        else if ( version[2] == 0x04 && version[6] == 0x13 ) 
                                tagtype = NTAG_216;
                                tagtype = NTAG_215;     
                        else if ( version[2] == 0x04 && version[6] == 0x13 ) 
                                tagtype = NTAG_216;


@@ -431,61 +502,31 @@ uint16_t GetHF14AMfU_Type(void){
                        
                        break;
                        }
                        
                        break;
                        }

-               case 0x01:{
-                       tagtype = UL_C; 
-                       break;
-               }
-               case 0x00: {
-                       tagtype = UL;
-                       break;
-               }
-               default :{
-                       tagtype = UNKNOWN;
-                       break;
-               }
-       }
-
-       if ((tagtype & ( UL_C | UL ))) {
-               // Magic UL-C, by observation,
-               // it seems to have a static nonce response to 0x1A command.
-               status = ul_select(&card);
-               status = ulc_requestAuthentication(0, nonce1, sizeof(nonce1));
-               if ( status > 0 ) {
-
-                       status = ulc_requestAuthentication(0, nonce2, sizeof(nonce2));
-                       
-                       tagtype =( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
-                               
-               } else {
-                       tagtype = UL;
-               }
-               ul_switch_off_field();
+               case 0x01: tagtype = UL_C; break;
+               case 0x00: tagtype = UL; break;
+               case -1:   tagtype = (UL | UL_C); break;
+               default:   tagtype = UNKNOWN; break;

        }
 
        }
 

-       //PrintAndLog("ICE %d", tagtype);
-       //Magic Ultralight test here.  It takes present UID, and tries to write it back.
-       if ( (tagtype & UL) ){
-               // read 3des key or PWD,  
-               // if response bytes == all zeros its a NORMAL tag.
-               //return UL_MAGIC;
-       }
+       if ((tagtype & ( UL_C | UL ))) tagtype = ulc_magic_test();
+       if ( (tagtype & UL) ) tagtype = ul_magic_test();

 
        return tagtype;
 }      
 
 int CmdHF14AMfUInfo(const char *Cmd){
 
 
        return tagtype;
 }      
 
 int CmdHF14AMfUInfo(const char *Cmd){
 

+       uint8_t authlim = 0xff;

        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t *key;
        int status;     
 
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t *key;
        int status;     
 

-       PrintAndLog("\n--- Tag Information ---------");
-       PrintAndLog("-------------------------------------------------------------");
-       

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

-       
+
+       PrintAndLog("\n--- Tag Information ---------");
+       PrintAndLog("-------------------------------------------------------------");

        ul_print_type(tagtype);
        
        status = ul_select(&card);
        ul_print_type(tagtype);
        
        status = ul_select(&card);


@@ -507,16 +548,16 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
        if ((tagtype & UL_C)){
        
 
        if ((tagtype & UL_C)){
        

-               // lookup lockbits before?

                // read pages 0x28, 0x29, 0x2A, 0x2B
                // read pages 0x28, 0x29, 0x2A, 0x2B

-               // tag may be locked

                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");
                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");

-               } else {
-                       ulc_print_configuration(ulc_conf);
-               }
+                       ul_switch_off_field();
+                       return status;
+               } 
+
+               ulc_print_configuration(ulc_conf);

 
                if ((tagtype & MAGIC)){
 
 
                if ((tagtype & MAGIC)){
 


@@ -527,17 +568,16 @@ int CmdHF14AMfUInfo(const char *Cmd){
                                ul_switch_off_field();
                                return status;
                        }
                                ul_switch_off_field();
                                return status;
                        }

-                       

                        ulc_print_3deskey(ulc_deskey);
 
                        ulc_print_3deskey(ulc_deskey);
 

-               }
-               else {
+               } else {

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

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

                                key = default_3des_keys[i];
                                if (try3DesAuthentication(key) == 1){
                                key = default_3des_keys[i];
                                if (try3DesAuthentication(key) == 1){

-                                       PrintAndLog("Found default 3des key: %s", sprint_hex(key,16));
+                                       PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
+                                       ulc_print_3deskey(SwapEndian64(key,16));

                                        return 0;
                                }
                        }
                                        return 0;
                                }
                        }


@@ -545,27 +585,29 @@ int CmdHF14AMfUInfo(const char *Cmd){
        }
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
        }
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {

-               
+

                ulev1_print_counters();
                
                ulev1_print_counters();
                

-               uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x25;
-               uint8_t ulev1_conf[16] = {0x00};
-               status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
+               uint8_t ulev1_signature[32] = {0x00};
+               status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));

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

-                       PrintAndLog("Error: tag didn't answer to READ C");
+                       PrintAndLog("Error: tag didn't answer to READ SIGNATURE");

                        ul_switch_off_field();
                        return status;
                }               
                        ul_switch_off_field();
                        return status;
                }               

-               ulev1_print_configuration(ulev1_conf);
+               ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));

                
                

-               uint8_t ulev1_signature[32] = {0x00};
-               status = ulev1_readSignature( 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 ){
                if ( status == -1 ){

-                       PrintAndLog("Error: tag didn't answer to READ SIGNATURE");
+                       PrintAndLog("Error: tag didn't answer to READ - possibly locked");

                        ul_switch_off_field();
                        ul_switch_off_field();

-                       return status;
+                       //return status;

                }
                }

-               ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+               // save AUTHENTICATION LIMITS for later:
+               authlim = (ulev1_conf[4] & 0x07);
+               ulev1_print_configuration(ulev1_conf);

        }
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
        }
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {


@@ -577,29 +619,32 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        ul_switch_off_field();
                        return status;
                }
                        ul_switch_off_field();
                        return status;
                }

-               ul_print_version(version);
+               ulev1_print_version(version);

                
                

-               //********** TODO ********************************
-               // --problem, there is a failed pwd tries counter in UL-EV1
-               PrintAndLog("\nTrying some known EV1/NTAG passwords.");
-                               
-               uint8_t password[4] ={0xff,0xff,0xff,0xff};
-               uint8_t pack[4] = {0,0,0,0};
-               status = ulev1_requestAuthentication(password, pack, sizeof(pack));
-               if ( status == -1 ){
-                       PrintAndLog("Error: tag didn't answer to AUTHENTICATE");
+               // AUTHLIMIT, (number of failed authentications)
+               // 0 = limitless.
+               // 1-7 = ...  should we even try then?
+               authlim = 1;
+               if ( authlim == 0 ){
+                       PrintAndLog("\n--- Known EV1/NTAG passwords.");
+               
+                       uint8_t pack[4] = {0,0,0,0};
+                       
+                       for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ){
+                               key = default_pwd_pack[i];
+                               if ( ulev1_requestAuthentication(key, pack, sizeof(pack)) > -1 ){
+                                       PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                               }
+                       }

                        ul_switch_off_field();
                        ul_switch_off_field();

-                       return status;

                }
                }

-               PrintAndLog("Found default password: %s",sprint_hex(password, sizeof(password)));
-               PrintAndLog("Got PACK : %s", sprint_hex(pack,sizeof(pack)));

        }
        
        if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
                
                PrintAndLog("\n--- NTAG NDEF Message");
                uint8_t cc[16] = {0x00};
        }
        
        if ((tagtype & (NTAG_213 | NTAG_215 | NTAG_216))){
                
                PrintAndLog("\n--- NTAG NDEF Message");
                uint8_t cc[16] = {0x00};

-               status = ul_read(2, cc, sizeof(cc));
+               status = ul_read(3, cc, sizeof(cc));

                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to READ D");
                        ul_switch_off_field();
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to READ D");
                        ul_switch_off_field();


@@ -796,6 +841,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                case 's':
                        swapEndian = true;
                        cmdp++;
                case 's':
                        swapEndian = true;
                        cmdp++;

+                       break;

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


@@ -976,7 +1022,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);

-               if(keyNo > 6) 
+               if(keyNo > KEYS_3DES_COUNT) 

                        errors = true;
        }
 
                        errors = true;
        }