]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
hf search - prelim - re-use hf mfu GetTagType...
[proxmark3-svn] / client / cmdhfmfu.c
index a94d8767dbccc3cb5278a657124adeb97aaeac22..884ed3ff8d4d323a304ff5670dbf04e6097ef436 100644 (file)
 #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,
-       MAGIC       = 0x0100,
-       UL_MAGIC    = UL | MAGIC,
-       UL_C_MAGIC  = UL_C | MAGIC,
-       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
@@ -49,6 +34,18 @@ uint8_t default_3des_keys[7][16] = {
                { 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);
 
 char* getProductTypeStr( uint8_t id){
@@ -77,17 +74,18 @@ char* getProductTypeStr( uint8_t id){
 */
 char* getUlev1CardSizeStr( uint8_t fsize ){
 
-       static char buf[30];
+       static char buf[40];
        char *retStr = buf;
+       memset(buf, 0, sizeof(buf));
 
-       uint8_t usize = 1 << ((fsize >>1) + 1);
-       uint8_t lsize = 1 << (fsize >>1);
+       uint16_t usize = 1 << ((fsize >>1) + 1);
+       uint16_t lsize = 1 << (fsize >>1);
 
        // is  LSB set?
        if (  fsize & 1 )
-               sprintf(retStr, "0x%02X (%u - %u bytes)",fsize, usize, lsize);
+               sprintf(retStr, "%02X (%u <-> %u bytes)",fsize, usize, lsize);
        else 
-               sprintf(retStr, "0x%02X (%u bytes)", fsize, lsize);             
+               sprintf(retStr, "%02X (%u bytes)", fsize, lsize);               
        return buf;
 }
 
@@ -107,6 +105,7 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
        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);
@@ -122,12 +121,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;
+       if (!resp.arg[0] && responseLength) return -1;
 
        uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-       if (resp.arg[0] > 0) {
-               memcpy(response, resp.d.asBytes, resplen);
-               return resplen;
-       } else return -1;
+       memcpy(response, resp.d.asBytes, resplen);
+       return resplen;
 }
 */
 static int ul_select( iso14a_card_select_t *card ){
@@ -152,6 +150,26 @@ static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
+static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
+
+       uint8_t cmd[18];
+       memset(cmd, 0x00, sizeof(cmd));
+       datalen = ( datalen > 16) ? 16 : datalen;
+
+       cmd[0] = ISO14443A_CMD_WRITEBLOCK;
+       cmd[1] = page;
+       memcpy(cmd+2, data, datalen);
+
+       uint8_t response[1] = {0xff};
+       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};
@@ -199,6 +217,15 @@ static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t respo
        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];
@@ -212,30 +239,39 @@ static int ul_print_default( uint8_t *data){
        uid[6] = data[7];
 
        PrintAndLog("       UID : %s ", sprint_hex(uid, 7));
-       PrintAndLog("    UID[0] : (Manufacturer Byte) = %02x, Manufacturer: %s",  uid[0], getTagInfo(uid[0]) );
-
-       // BBC
+       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 : 0x%02X - Ok", data[3]);
+               PrintAndLog("      BCC0 : %02X - Ok", data[3]);
        else
-               PrintAndLog("      BCC0 : 0x%02X - crc should be %02x", data[3], crc0);
+               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 : 0x%02X - Ok", data[8]);
+               PrintAndLog("      BCC1 : %02X - Ok", data[8]);
        else
-               PrintAndLog("      BCC1 : 0x%02X - crc should be 0x%02X", data[8], crc1 );
+               PrintAndLog("      BCC1 : %02X - crc should be %02X", data[8], crc1 );
 
-       PrintAndLog("  Internal : 0x%02X - %s default", data[9], (data[9]==0x48)?"":"not" );
+       PrintAndLog("  Internal : %02X - %s default", data[9], (data[9]==0x48)?"":"not" );
        PrintAndLog("      Lock : %s - %s", sprint_hex(data+10, 2),printBits( 2, data+10) );
        PrintAndLog("OneTimePad : %s ", sprint_hex(data + 12, 4));
        PrintAndLog("");
        return 0;
 }
 
-static int ul_print_CC(uint8_t *data) {
+static int ntag_print_CC(uint8_t *data) {
+
+       PrintAndLog("\n--- NTAG NDEF Message");
+
        if(data[0] != 0xe1) {
                PrintAndLog("no NDEF message");
                return -1;              // no NDEF message
@@ -244,51 +280,57 @@ static int ul_print_CC(uint8_t *data) {
        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 of this tag: %d bytes", data[2], (data[2] + 1) * 8);
+       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;
 }
 
-static int ul_print_version(uint8_t *data){
-       PrintAndLog("\n--- UL-EV1 / NTAG Version");
-       PrintAndLog("Raw version 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("   Major version : 0x%02X" , data[4]);
-       PrintAndLog("   Minor version : 0x%02X" , data[5]);
-       PrintAndLog("            Size : %s", getUlev1CardSizeStr(data[6]));
-       PrintAndLog("   Protocol type : 0x%02X" , data[7]);
-       return 0;
-}
+int ul_print_type(uint16_t tagtype, uint8_t spaces){
+       char spc[11] = "          ";
+       spc[10]=0x00;
+       char *spacer = spc + (10-spaces);
 
-static int ul_print_type(uint16_t tagtype){
        if ( tagtype & UL )     
-               PrintAndLog("      TYPE : MIFARE Ultralight (MF0ICU1) %s", (tagtype & MAGIC)?"<magic>":"");
+               PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype);
        else if ( tagtype & UL_C)
-               PrintAndLog("      TYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", (tagtype & MAGIC)?"<magic>":"", tagtype );
+               PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", spacer, (tagtype & MAGIC)?"<magic>":"", tagtype );
        else if ( tagtype & UL_EV1_48)
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)"); 
-       else if ( tagtype & UL_EV1_128) 
-               PrintAndLog("      TYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)");
+               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("      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("%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("      TYPE : Unknown %04x",tagtype);
+               PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype);
        return 0;
 }
 
 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;
 }
@@ -296,20 +338,20 @@ static int ulc_print_3deskey( uint8_t *data){
 static int ulc_print_configuration( uint8_t *data){
 
        PrintAndLog("--- UL-C Configuration");
-       PrintAndLog(" Higher Lockbits [40/0x28]: %s %s", sprint_hex(data, 4), printBits(2, data));
-       PrintAndLog("         Counter [41/0x29]: %s %s", sprint_hex(data+4, 4), printBits(2, data+4));
+       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 Pages above %d needs authentication", sprint_hex(data+8, 4), data[8] );
+               PrintAndLog("           Auth0 [42/0x2A]: %s Pages above %d needs authentication", sprint_hex(data+8, 4), data[8] );
        else{
                if ( data[8] == 0){
-                       PrintAndLog("           Auth0 [42/0x2A]: %s default", sprint_hex(data+8, 4) );
+                       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("           Auth0 [42/0x2A]: %s auth byte is out-of-range", sprint_hex(data+8, 4) );
                }
        }
-       PrintAndLog("           Auth1 [43/0x2B]: %s %s",
+       PrintAndLog("           Auth1 [43/0x2B]: %s %s",
                        sprint_hex(data+12, 4),
                        (data[12] & 1) ? "write access restricted": "read and write access restricted"
                        );
@@ -327,16 +369,19 @@ static int ulev1_print_configuration( uint8_t *data){
        uint8_t vctid = data[5];
 
        PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));
-       PrintAndLog("                    - pages above %d needs authentication",data[3]);
+       if ( data[3] < 0xff )
+               PrintAndLog("                    - pages above %d needs 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("                    - Max number of password attempts is unlimited");
+               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("               0x%02X - Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
+       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;
@@ -347,18 +392,88 @@ 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) );
-               PrintAndLog("Counter [%d] : %s", i, sprint_hex(counter,3));
+               PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
        }
        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(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};
-       uint8_t nonce1[11] = {0x00};
-       uint8_t nonce2[11] = {0x00};
        int status = 0;
        int len;
 
@@ -370,94 +485,85 @@ uint16_t GetHF14AMfU_Type(void){
        }
        // Ultralight - ATQA / SAK 
        if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
-               PrintAndLog     ("Tag is not UL or NTAG, ATQA1: %x, ATQA0: %x, SAK: %d", 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;
        }
 
-       len  = ulev1_getVersion(version, sizeof(version));
-       ul_switch_off_field();
+       if ( card.uid[0] != 0x05) {
 
-       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 )
-                               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;
+               len  = ulev1_getVersion(version, sizeof(version));
+               if (len > -1) ul_switch_off_field();  //if -1 it is already off
 
-                       break;
-               }
-               case 0x01:{
-                       tagtype = UL_C; 
-                       break;
-               }
-               case 0x00: {
-                       tagtype = UL;
-                       break;
-               }
-               default :{
-                       tagtype = UNKNOWN;
-                       break;
-               }
-       }
+               switch (len) {
+                       case 0x0A: {
 
-       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);
-               if ( status < 1 ){
-                       PrintAndLog("Error: couldn't select B");
-                       ul_switch_off_field();
-                       return UL_ERROR;
+                               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?
+                       default  : tagtype = UNKNOWN; break;
                }
-               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;
+               if (tagtype == (UL | UL_C)) {
+                       status = ul_select(&card);
+                       if ( status < 1 ){
+                               PrintAndLog("Error: couldn't select 2");
+                               ul_switch_off_field();
+                               return UL_ERROR;
+                       }
+                       uint8_t nonce1[11] = {0x00};
+                       status = ulc_requestAuthentication(0, nonce1, sizeof(nonce1));
+                       if ( status > 0 )
+                               tagtype = UL_C;
+                       else
+                               tagtype = 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 ){
+                       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;
                }
-               ul_switch_off_field();
        }
 
-       //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;
-       }
+       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 authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t *key;
        int status;
 
-
        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 ){
@@ -469,8 +575,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
        // 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();
+               PrintAndLog("Error: tag didn't answer to READ");
                return status;
        }
 
@@ -483,10 +588,8 @@ int CmdHF14AMfUInfo(const char *Cmd){
                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();
                        return status;
                } 
-
                ulc_print_configuration(ulc_conf);
 
                if ((tagtype & MAGIC)){
@@ -494,21 +597,19 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        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 B");
-                               ul_switch_off_field();
+                               PrintAndLog("Error: tag didn't answer to READ magic");
                                return status;
                        }
-
                        ulc_print_3deskey(ulc_deskey);
 
-               }
-               else {
+               } else {
                        PrintAndLog("Trying some default 3des keys");
                        ul_switch_off_field();
                        for (uint8_t i = 0; i < 7; ++i ){
                                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;
                                }
                        }
@@ -516,18 +617,26 @@ int CmdHF14AMfUInfo(const char *Cmd){
        }
 
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
-
+               //do counters and signature first (don't neet auth)
                ulev1_print_counters();
 
-               uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x24;
+               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 C");
-                       ul_switch_off_field();
+                       PrintAndLog("Error: tag didn't answer to READ EV1");
                        return status;
                }
-
+               // save AUTHENTICATION LIMITS for later:
+               authlim = (ulev1_conf[4] & 0x07);
                ulev1_print_configuration(ulev1_conf);
        }
 
@@ -537,41 +646,43 @@ int CmdHF14AMfUInfo(const char *Cmd){
                status  = ulev1_getVersion(version, sizeof(version));
                if ( status == -1 ){
                        PrintAndLog("Error: tag didn't answer to GETVERSION");
-                       ul_switch_off_field();
                        return status;
                }
-               ul_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");
-                       ul_switch_off_field();
-                       return status;
+               ulev1_print_version(version);
+
+               // AUTHLIMIT, (number of failed authentications)
+               // 0 = limitless.
+               // 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 < 3; ++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();
                }
-               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};
-               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();
+                       PrintAndLog("Error: tag didn't answer to READ ntag");
                        return status;
                }
-               ul_print_CC(cc);
+               ntag_print_CC(cc);
        }
-
+       
        ul_switch_off_field();
+       PrintAndLog("");
        return 0;
 }
 
@@ -759,6 +870,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                case 's':
                        swapEndian = true;
                        cmdp++;
+                       break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                        errors = true;
Impressum, Datenschutz