]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
MFU adjustment to allow 0 len returns from raw cmds
[proxmark3-svn] / client / cmdhfmfu.c
index 1886fc3d8fecadba54d869e5cf84356345bf9e2c..a94d8767dbccc3cb5278a657124adeb97aaeac22 100644 (file)
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "mifare.h"
+#include "util.h"
+#include "protocols.h"
 
-#define MAX_UL_BLOCKS   0x0f
-#define MAX_ULC_BLOCKS  0x2f
-#define MAX_ULEV1a_BLOCKS 0x0b;
-#define MAX_ULEV1b_BLOCKS 0x20;
+#define MAX_UL_BLOCKS     0x0f
+#define MAX_ULC_BLOCKS    0x2f
+#define MAX_ULEV1a_BLOCKS 0x0b
+#define MAX_ULEV1b_BLOCKS 0x20
+#define MAX_NTAG_213      0x2c
+#define MAX_NTAG_215      0x86
+#define MAX_NTAG_216      0xe6
+
+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] = {
                { 0x42,0x52,0x45,0x41,0x4b,0x4d,0x45,0x49,0x46,0x59,0x4f,0x55,0x43,0x41,0x4e,0x21 },// 3des std key
@@ -26,176 +47,531 @@ uint8_t default_3des_keys[7][16] = {
                { 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
-       };
-       
+};
+
 static int CmdHelp(const char *Cmd);
 
-// return 1 if tag responded to 0x1A.
-uint8_t requestAuthentication( uint8_t* nonce){
+char* getProductTypeStr( uint8_t id){
+
+       static char buf[20];
+       char *retStr = buf;
+
+       switch(id) {
+               case 3:
+                       sprintf(retStr, "0x%02X %s", id, "(Ultralight)");
+                       break;
+               case 4:
+                       sprintf(retStr, "0x%02X %s", id, "(NTAG)");
+                       break;
+               default:
+                       sprintf(retStr, "0x%02X %s", id, "(unknown)");
+                       break;
+       }
+       return buf;
+}
+
+/*
+  The 7 MSBits (=n) code the storage size itself based on 2^n, 
+  the LSBit is set to '0' if the size is exactly 2^n
+  and set to '1' if the storage size is between 2^n and 2^(n+1). 
+*/
+char* getUlev1CardSizeStr( uint8_t fsize ){
+
+       static char buf[30];
+       char *retStr = buf;
+
+       uint8_t usize = 1 << ((fsize >>1) + 1);
+       uint8_t lsize = 1 << (fsize >>1);
+
+       // is  LSB set?
+       if (  fsize & 1 )
+               sprintf(retStr, "0x%02X (%u - %u bytes)",fsize, usize, lsize);
+       else 
+               sprintf(retStr, "0x%02X (%u bytes)", fsize, lsize);             
+       return buf;
+}
+
+static void ul_switch_on_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+       SendCommand(&c);
+}
 
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC ,2 ,0}};
-       c.d.asBytes[0] = 0x1A;
-       c.d.asBytes[1] = 0x00;
+static void ul_switch_off_field(void) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
        SendCommand(&c);
-       UsbCommand resp;        
-       WaitForResponse(CMD_ACK, &resp);  // skip select answer.
+}
 
-       if ( !(resp.arg[0] & 0xff) ) 
-               return 0;
+static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC, cmdlen, 0}};
+       memcpy(c.d.asBytes, cmd, cmdlen);
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+
+       uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
+       memcpy(response, resp.d.asBytes, resplen);
+       return resplen;
+}
+/*
+static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength, bool append_crc ) {
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT , cmdlen, 0}};
+       if (append_crc)
+               c.arg[0] |= ISO14A_APPEND_CRC;
+
+       memcpy(c.d.asBytes, cmd, cmdlen);       
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) 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;
+}
+*/
+static int ul_select( iso14a_card_select_t *card ){
+
+       ul_switch_on_field();
+
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+       if (resp.arg[0] < 1) return -1;
+
+       memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
+       return resp.arg[0];
+}
+
+// This read command will at least return 16bytes.
+static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if ( len == -1 )
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulc_requestAuthentication( uint8_t blockNo, uint8_t *nonce, uint16_t nonceLength ){
+
+       uint8_t cmd[] = {MIFARE_ULC_AUTH_1, blockNo};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
+       if ( len == -1 ) 
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
+       if ( len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_VERSION}; 
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if ( len == -1 )
+               ul_switch_off_field();
+       return len;
+}
+
+// static int ulev1_fastRead( uint8_t startblock, uint8_t endblock, uint8_t *response ){
        
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+       // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock};
        
-               if ( resp.arg[0] & 0xff ) {
-                       memcpy(nonce, resp.d.asBytes+1, 8);
-                       return 1;
-               }
-       } 
+       // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){
+               // ul_switch_off_field();
+               // return -1;
+       // }
+       // return 0;
+// }
+
+static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ul_print_default( uint8_t *data){
+
+       uint8_t uid[7];
+
+       uid[0] = data[0];
+       uid[1] = data[1];
+       uid[2] = data[2];
+       uid[3] = data[4];
+       uid[4] = data[5];
+       uid[5] = data[6];
+       uid[6] = data[7];
+
+       PrintAndLog("       UID : %s ", sprint_hex(uid, 7));
+       PrintAndLog("    UID[0] : (Manufacturer Byte) = %02x, Manufacturer: %s",  uid[0], getTagInfo(uid[0]) );
+
+       // BBC
+       // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
+       int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
+       if ( data[3] == crc0 )
+               PrintAndLog("      BCC0 : 0x%02X - Ok", data[3]);
+       else
+               PrintAndLog("      BCC0 : 0x%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]);
+       else
+               PrintAndLog("      BCC1 : 0x%02X - crc should be 0x%02X", data[8], crc1 );
+
+       PrintAndLog("  Internal : 0x%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;
 }
 
-typedef enum TAGTYPE_UL {
-       UNKNOWN     = 0x00,
-       UL          = 0x01,
-       UL_C        = 0x02,
-       UL_EV1_48   = 0x04,
-       UL_EV1_128  = 0x08,
-       UL_MAGIC    = 0x11,
-       UL_C_MAGIC  = 0x12,
-       MAGIC       = 0x10,
-       UL_ERROR    = 0xFF,
-} TagTypeUL_t;
+static int ul_print_CC(uint8_t *data) {
+       if(data[0] != 0xe1) {
+               PrintAndLog("no NDEF message");
+               return -1;              // no NDEF message
+       }
 
-uint8_t GetHF14AMfU_Type(uint8_t *data, uint8_t dataSize){
-       TagTypeUL_t tagtype = UNKNOWN;
-       uint8_t isOK  = 0;
+       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: %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;
+}
 
-       UsbCommand c = {CMD_MIFAREU_READCARD, {0, 4}};
-       SendCommand(&c);
-       UsbCommand resp;
+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;
+}
+
+static int ul_print_type(uint16_t tagtype){
+       if ( tagtype & UL )     
+               PrintAndLog("      TYPE : MIFARE Ultralight (MF0ICU1) %s", (tagtype & MAGIC)?"<magic>":"");
+       else if ( tagtype & UL_C)
+               PrintAndLog("      TYPE : MIFARE Ultralight C (MF0ULC) %s [%x]", (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)");
+       else if ( tagtype & NTAG_213 )
+               PrintAndLog("      TYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)");
+       else if ( tagtype & NTAG_215 )
+               PrintAndLog("      TYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)");
+       else if ( tagtype & NTAG_216 )
+               PrintAndLog("      TYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)");
+       else
+               PrintAndLog("      TYPE : Unknown %04x",tagtype);
+       return 0;
+}
 
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-               isOK  = resp.arg[0] & 0xff;
-               memcpy(data, resp.d.asBytes, dataSize);
+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(" 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
+       return 0;
+}
 
-               if (!isOK) {
-                       PrintAndLog("Error reading from tag");
-                       return UL_ERROR;
+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));
+
+       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] );
+       else{
+               if ( data[8] == 0){
+                       PrintAndLog("           Auth0 [42/0x2A]: %s - default", sprint_hex(data+8, 4) );
+               } else {
+                       PrintAndLog("           Auth0 [42/0x2A]: %s - auth byte is out-of-range", sprint_hex(data+8, 4) );
                }
-       } else {
-               PrintAndLog("Command execute timed out");
+       }
+       PrintAndLog("           Auth1 [43/0x2B]: %s - %s",
+                       sprint_hex(data+12, 4),
+                       (data[12] & 1) ? "write access restricted": "read and write access restricted"
+                       );
+       return 0;
+}
+
+static int ulev1_print_configuration( uint8_t *data){
+
+       PrintAndLog("\n--- UL-EV1 Configuration");
+
+       bool strg_mod_en = (data[0] & 2);
+       uint8_t authlim = (data[4] & 0x07);
+       bool cfglck = (data[4] & 0x40);
+       bool prot = (data[4] & 0x80);
+       uint8_t vctid = data[5];
+
+       PrintAndLog(" cfg0 [16/0x10]: %s", sprint_hex(data, 4));
+       PrintAndLog("                    - pages above %d needs authentication",data[3]);
+       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");
+       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(" PWD  [18/0x12]: %s", sprint_hex(data+8, 4));
+       PrintAndLog(" PACK [19/0x13]: %s", sprint_hex(data+12, 4));
+       return 0;
+}
+
+static int ulev1_print_counters(){
+       PrintAndLog("--- UL-EV1 Counters");
+       uint8_t 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));
+       }
+       return 0;
+}
+
+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;
+
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("Error: couldn't select");
+               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 UL or NTAG, ATQA1: %x, ATQA0: %x, SAK: %d", card.atqa[1],card.atqa[0],card.sak);
+               ul_switch_off_field();
                return UL_ERROR;
        }
-       
-       c.cmd = CMD_READER_ISO_14443a;
-       c.arg[0] = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC;
-       c.arg[1] = 1;
-       c.arg[2] = 0;
-       c.d.asBytes[0] = 0x60;
-       SendCommand(&c);
-       WaitForResponse(CMD_ACK, &resp);
-       
-       if ( resp.arg[0] ) {
-               if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
 
-                       uint8_t version[8] = {0,0,0,0,0,0,0,0};
-                       memcpy(&version, resp.d.asBytes, sizeof(version));
-                       uint8_t len  = resp.arg[0] & 0xff;
-                       
-                       if ( len == 0x0A && version[6] == 0x0B ) 
+       len  = ulev1_getVersion(version, sizeof(version));
+       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 ( len == 0x0A && version[6] != 0x0B ) 
+                       else if ( version[2] == 0x03 && version[6] != 0x0B )
                                tagtype = UL_EV1_128;
-                       else if ( len == 0x01 )
-                               tagtype = UL_C; 
-                       else if ( len == 0x00 )
-                               tagtype = UL; //| UL_MAGIC | UL_C_MAGIC 
+                       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;
+               }
+               default :{
+                       tagtype = UNKNOWN;
+                       break;
                }
        }
-       
-       // Magic UL-C, mine have a static nonce response to 0x1A command.
-       uint8_t nonce1[8] = {0,0,0,0,0,0,0,0};
-       uint8_t nonce2[8] = {0,0,0,0,0,0,0,0};
-       uint8_t status = requestAuthentication(nonce1);
-       if ( status ) {
-               requestAuthentication(nonce2);
-               if ( !memcmp(nonce1, nonce2, 8) )
-                       tagtype ^= MAGIC;
-       } else {
-               // Magic Ultralight test here - TODO
+
+       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;
+               }
+               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();
+       }
+
+       //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;
        }
+
        return tagtype;
 }
 
 int CmdHF14AMfUInfo(const char *Cmd){
 
-       TagTypeUL_t tagtype = UNKNOWN;
-       
-       uint8_t datatemp[7] = {0x00};
+
        uint8_t data[16] = {0x00};
+       iso14a_card_select_t card;
+       uint8_t *key;
+       int status;
 
-       tagtype = GetHF14AMfU_Type(data, sizeof(data));
+
+       TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
-       
-       PrintAndLog("\n-- Tag Information ---------");
+
+       PrintAndLog("\n--- Tag Information ---------");
        PrintAndLog("-------------------------------------------------------------");
-       switch(tagtype){
-               case UNKNOWN    : PrintAndLog("      TYPE : Unknown"); return 0;
-               case UL         : PrintAndLog("      TYPE : MIFARE Ultralight");break;
-               case UL_C       : PrintAndLog("      TYPE : MIFARE Ultralight C");break;
-               case UL_EV1_48  : PrintAndLog("      TYPE : MIFARE Ultralight EV1 48 bytes"); break;
-               case UL_EV1_128 : PrintAndLog("      TYPE : MIFARE Ultralight EV1 128 bytes"); break;
-               case UL_MAGIC   : PrintAndLog("      TYPE : MIFARE Ultralight (MAGIC)");break;
-               case UL_C_MAGIC : PrintAndLog("      TYPE : MIFARE Ultralight-C (MAGIC)");break;
-               default         : PrintAndLog("      TYPE : Unknown %x",tagtype);break;
+       ul_print_type(tagtype);
+
+       status = ul_select(&card);
+       if ( status < 1 ){
+               PrintAndLog("Error: couldn't select");
+               ul_switch_off_field();
+               return status;
        }
-       
-       // UID
-       memcpy( datatemp, data, 3);
-       memcpy( datatemp+3, data+4, 4);
-       
-       PrintAndLog("       UID : %s ", sprint_hex(datatemp, 7));
-       PrintAndLog("    UID[0] : (Manufacturer Byte) = %02x, Manufacturer: %s",  datatemp[0], getTagInfo(datatemp[0]) );
-       
-       // BBC
-       // CT (cascade tag byte) 0x88 xor SN0 xor SN1 xor SN2 
-       int crc0 = 0x88 ^ data[0] ^ data[1] ^data[2];
-       if ( data[3] == crc0 )
-               PrintAndLog("      BCC0 : %02x - Ok", data[3]);
-       else
-               PrintAndLog("      BCC0 : %02x - crc should be %02x", data[3], crc0);
-               
-       int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
-       if ( data[8] == crc1 )
-               PrintAndLog("      BCC1 : %02x - Ok", data[8]);
-       else
-               PrintAndLog("      BCC1 : %02x - crc should be %02x", data[8], crc1 );
-       
-       PrintAndLog("  Internal : %s ", sprint_hex(data + 9, 1));
-       
-       memcpy(datatemp, data+10, 2);
-       PrintAndLog("      Lock : %s - %s", sprint_hex(datatemp, 2),printBits( 2, &datatemp) );
-       PrintAndLog("OneTimePad : %s ", sprint_hex(data + 3*4, 4));
-       PrintAndLog("");
-       
-       
-       PrintAndLog("--- ");
+
+       // 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;
+       }
+
+       ul_print_default(data);
+
        if ((tagtype & UL_C)){
-               
-               PrintAndLog("Trying some default 3des keys");
-               uint8_t *key;
-               
-               for (uint8_t i = 0; i < 5; ++i ){
-                       key = default_3des_keys[i];
-                       if (try3DesAuthentication(key)){
-                               PrintAndLog("Found default 3des key: %s", sprint_hex(key,16));
-                               return 0;
+
+               // read pages 0x28, 0x29, 0x2A, 0x2B
+               uint8_t ulc_conf[16] = {0x00};
+               status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ - possibly locked");
+                       ul_switch_off_field();
+                       return status;
+               } 
+
+               ulc_print_configuration(ulc_conf);
+
+               if ((tagtype & MAGIC)){
+
+                       uint8_t ulc_deskey[16] = {0x00};
+                       status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
+                       if ( status == -1 ){
+                               PrintAndLog("Error: tag didn't answer to READ B");
+                               ul_switch_off_field();
+                               return status;
+                       }
+
+                       ulc_print_3deskey(ulc_deskey);
+
+               }
+               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));
+                                       return 0;
+                               }
                        }
-               }               
+               }
        }
-       else if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
+
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
+
+               ulev1_print_counters();
+
+               uint8_t startconfigblock = (tagtype & UL_EV1_48) ? 0x10 : 0x24;
+               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();
+                       return status;
+               }
+
+               ulev1_print_configuration(ulev1_conf);
+       }
+
+       if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
+
+               uint8_t version[10] = {0x00};
+               status  = ulev1_getVersion(version, sizeof(version));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to GETVERSION");
+                       ul_switch_off_field();
+                       return status;
+               }
+               ul_print_version(version);
+
                //********** TODO ********************************
-               //PrintAndLog("Trying some known EV1 passwords.");
+               // --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;
+               }
+               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));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ D");
+                       ul_switch_off_field();
+                       return status;
+               }
+               ul_print_CC(cc);
        }
+
+       ul_switch_off_field();
        return 0;
 }
 
@@ -310,108 +686,148 @@ int CmdHF14AMfURdBl(const char *Cmd){
        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("  Options : ");
+       PrintAndLog("  k <key> : Enter key for authentication");
+       PrintAndLog("  n <FN > : Enter filename w/o .bin to save the dump as"); 
+       PrintAndLog("        s : Swap entered key's endianness for auth");
+       PrintAndLog("");
+       PrintAndLog("   sample : hf mfu dump");
+       PrintAndLog("          : hf mfu dump n myfile");
+       return 0;
+}
 //
-//  Mifare Ultralight / Ultralight-C;  Read and Dump Card Contents
+//  Mifare Ultralight / Ultralight-C / Ultralight-EV1
+//  Read and Dump Card Contents,  using auto detection of tag size.
 //
+//  TODO: take a password to read UL-C / UL-EV1 tags.
 int CmdHF14AMfUDump(const char *Cmd){
 
        FILE *fout;
        char filename[FILE_PATH_SIZE] = {0x00};
-       char * fnameptr = filename;
-       
+       char *fnameptr = filename;
+       char *str = "Dumping Ultralight%s%s Card Data...";
        uint8_t *lockbytes_t = NULL;
        uint8_t lockbytes[2] = {0x00};
-       
        uint8_t *lockbytes_t2 = NULL;
        uint8_t lockbytes2[2] = {0x00};
-
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
-       
-       int i;
-       uint8_t BlockNo      = 0;
-       int Pages            = 16;
-
-       bool tmplockbit          = false;
-       uint8_t isOK         = 0;
-       uint8_t *data       = NULL;
-
-       char cmdp = param_getchar(Cmd, 0);
-       
-       if (cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Reads all pages from Mifare Ultralight or Ultralight-C tag.");
-               PrintAndLog("It saves binary dump into the file `filename.bin` or `cardUID.bin`");              
-               PrintAndLog("Usage:  hf mfu dump <c> <filename w/o .bin>");
-               PrintAndLog("     <c>  optional cardtype c == Ultralight-C, Defaults to Ultralight");
-               PrintAndLog("     sample: hf mfu dump");
-               PrintAndLog("           : hf mfu dump myfile");
-               PrintAndLog("           : hf mfu dump c myfile");
-               return 0;
-       }
+       uint8_t data[1024] = {0x00};
+       bool hasPwd = false;
+       int i = 0;
+       int Pages = 16;
+       bool tmplockbit = false;
+       uint8_t dataLen=0;
+       uint8_t cmdp =0;
+       uint8_t key[16] = {0x00};
+       uint8_t *keyPtr = key;
+       size_t fileNlen = 0;
+       bool errors = false;
+       bool swapEndian = false;
 
-       // UL or UL-C?
-       Pages = (cmdp == 'c' || cmdp == 'C') ? 44 : 16;
-       
-       uint8_t data2[16] = {0x00};
-       TagTypeUL_t tagtype = GetHF14AMfU_Type(data2, sizeof(data2));
-       switch(tagtype){
-               case UL_C:
-                       Pages = 44;
-                       PrintAndLog("Dumping Ultralight_C Card Data...");
-                       break;
-               case UL_EV1_48:
-                       Pages = 18; 
-                       PrintAndLog("Dumping Ultralight EV1_48 Card Data...");
-                       break;
-               case UL_EV1_128:
-                       Pages = 32; 
-                       PrintAndLog("Dumping Ultralight EV1_128 Card Data...");
-                       break;
-               case UL_MAGIC: 
-                       Pages = 16;
-                       PrintAndLog("Dumping Ultralight (Magic) Card Data...");
+       while(param_getchar(Cmd, cmdp) != 0x00)
+       {
+               switch(param_getchar(Cmd, cmdp))
+               {
+               case 'h':
+               case 'H':
+                       return usage_hf_mfu_dump();
+               case 'k':
+               case 'K':
+                       dataLen = param_gethex(Cmd, cmdp+1, data, 32);
+                       if (dataLen) {
+                               errors = true; 
+                       } else {
+                               memcpy(key, data, 16);
+                       }   
+                       cmdp += 2;
+                       hasPwd = true;
                        break;
-               case UL_C_MAGIC: 
-                       Pages = 44;
-                       PrintAndLog("Dumping Ultralight_C (Magic) Card Data...");
+               case 'n':
+               case 'N':
+                       fileNlen = param_getstr(Cmd, cmdp+1, filename);
+                       if (!fileNlen) errors = true; 
+                       if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
+                       cmdp += 2;
                        break;
-               case UL:
+               case 's':
+                       swapEndian = true;
+                       cmdp++;
                default:
-                       Pages = 16;
-                       PrintAndLog("Dumping Ultralight Card Data...");
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
                        break;
+               }
+               if(errors) break;
        }
-       //PrintAndLog("Dumping Ultralight%s Card Data...", (Pages ==16)?"":"-C");
-               
-       UsbCommand c = {CMD_MIFAREU_READCARD, {BlockNo,Pages}};
-       SendCommand(&c);
-       UsbCommand resp;
 
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
-               isOK  = resp.arg[0] & 0xff;
-               if (!isOK) {                
-                       PrintAndLog("Command error");
-                       return 0;
-               }
-               data  = resp.d.asBytes;
+       //Validations
+       if(errors) return usage_hf_mfu_dump();
+
+       if (swapEndian)
+               keyPtr = SwapEndian64(data, 16);
+
+       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.");
+       }
+
+       UsbCommand c = {CMD_MIFAREUC_READCARD, {0,Pages}};
+       if ( hasPwd ) {
+               c.arg[2] = 1;
+               memcpy(c.d.asBytes, key, 16);
+       }
+       SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
                PrintAndLog("Command execute time-out");
-               return 0;
+               return 1;
        }
-               
+       PrintAndLog     ("%u,%u",resp.arg[0],resp.arg[1]);
+       uint8_t isOK = resp.arg[0] & 0xff;
+       if (isOK) {
+               memcpy(data, resp.d.asBytes, resp.arg[1]);
+       } else {
+               PrintAndLog("Failed reading block: (%02x)", i);
+               return 1;
+       }
+
        // Load lock bytes.
        int j = 0;
-       
+
        lockbytes_t = data + 8;
        lockbytes[0] = lockbytes_t[2];
        lockbytes[1] = lockbytes_t[3];
        for(j = 0; j < 16; j++){
                bit[j] = lockbytes[j/8] & ( 1 <<(7-j%8));
-       }               
-       
+       }
+
        // Load bottom lockbytes if available
        if ( Pages == 44 ) {
-               
                lockbytes_t2 = data + (40*4);
                lockbytes2[0] = lockbytes_t2[2];
                lockbytes2[1] = lockbytes_t2[3];
@@ -420,13 +836,16 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
+       // add keys
+       if (hasPwd){
+               memcpy(data + Pages*4, key, 16);
+               Pages += 4;
+       }
        for (i = 0; i < Pages; ++i) {
-               
                if ( i < 3 ) {
                        PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
                        continue;
                }
-
                switch(i){
                        case 3: tmplockbit = bit[4]; break;
                        case 4: tmplockbit = bit[3]; break;
@@ -473,27 +892,16 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
                PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
        }  
-       
-       int len = 0;
-       if ( Pages == 16 )
-               len = param_getstr(Cmd,0,filename);
-       else
-               len = param_getstr(Cmd,1,filename);
-
-       if (len > FILE_PATH_SIZE-5) len = FILE_PATH_SIZE-5;
 
        // user supplied filename?
-       if (len < 1) {
-       
+       if (fileNlen < 1) {
                // UID = data 0-1-2 4-5-6-7  (skips a beat)
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
                        data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
-
        } else {
-               sprintf(fnameptr + len," .bin");
+               sprintf(fnameptr + fileNlen," .bin");
        }
 
-
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
                return 1;       
@@ -553,8 +961,8 @@ int CmdHF14AMfucAuth(const char *Cmd){
        } 
 
        uint8_t *key = default_3des_keys[keyNo];
-       if (try3DesAuthentication(key))
-               PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 8));
+       if (try3DesAuthentication(key)>0)
+               PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
        else
                PrintAndLog("Authentication failed");
                        
@@ -720,6 +1128,7 @@ int CmdTestDES(const char * cmd)
        return 0;       
 }
 **/
+
 //
 // Ultralight C Read Single Block
 //
@@ -728,23 +1137,23 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
        UsbCommand resp;
        bool hasPwd = FALSE;
        uint8_t blockNo = -1;
-       unsigned char key[16];
+       uint8_t key[16];
        char cmdp = param_getchar(Cmd, 0);
-       
+
        if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  hf mfu crdbl  <block number> <password>");
+               PrintAndLog("Usage:  hf mfu crdbl  <block number> <key>");
                PrintAndLog("");
                PrintAndLog("sample: hf mfu crdbl 0");
-               PrintAndLog("        hf mfu crdbl 0 112233445566778899AABBCCDDEEFF");
+               PrintAndLog("        hf mfu crdbl 0 00112233445566778899AABBCCDDEEFF");
                return 0;
-       }       
-               
+       }
+
        blockNo = param_get8(Cmd, 0);
        if (blockNo < 0) {
                PrintAndLog("Wrong block number");
                return 1;
        }
-       
+
        if (blockNo > MAX_ULC_BLOCKS ){
                PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
                return 1;
@@ -759,6 +1168,7 @@ int CmdHF14AMfUCRdBl(const char *Cmd)
                        hasPwd = TRUE;
                }       
        }       
+       //uint8_t *key2 = SwapEndian64(key, 16);
 
        //Read Block
        UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
@@ -816,14 +1226,15 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                PrintAndLog("Block data must include 8 HEX symbols");
                return 1;
        }
-       
+
        if (strchr(Cmd,'w') != 0  || strchr(Cmd,'W') != 0 ) {
                chinese_card = TRUE; 
        }
-       
+
        if ( blockNo <= 3 ) {
                if (!chinese_card){
-                        PrintAndLog("Access Denied");  
+                       PrintAndLog("Access Denied");  
+                       return 1;
                } else {
                        PrintAndLog("--Special block no: 0x%02x", blockNo);
                        PrintAndLog("--Data: %s", sprint_hex(bldata, 4));
@@ -835,8 +1246,9 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk:%02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
-                       }  
-               }       
+                               return 1;
+                       }
+               }
        } else {
                        PrintAndLog("--Block no : 0x%02x", blockNo);
                        PrintAndLog("--Data: %s", sprint_hex(bldata, 4));               
@@ -848,6 +1260,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk : %02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
+                               return 1;
                        }
        }
        return 0;
@@ -899,7 +1312,7 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 }
 
 //
-// Mifare Ultraligh - Set UID
+// Magic UL / UL-C tags  - Set UID
 //
 int CmdHF14AMfucSetUid(const char *Cmd){
 
@@ -1080,17 +1493,17 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 //------------------------------------
 static command_t CommandTable[] =
 {
-       {"help",        CmdHelp,                        1,"This help"},
-       {"dbg",         CmdHF14AMfDbg,          0,"Set default debug mode"},
-       {"info",        CmdHF14AMfUInfo,        0,"Taginfo"},
-       {"dump",        CmdHF14AMfUDump,        0,"Dump MIFARE Ultralight / Ultralight-C tag to binary file"},
-       {"rdbl",        CmdHF14AMfURdBl,        0,"Read block  - MIFARE Ultralight"},
-       {"wrbl",        CmdHF14AMfUWrBl,        0,"Write block - MIFARE Ultralight"},    
-       {"crdbl",       CmdHF14AMfUCRdBl,       0,"Read block  - MIFARE Ultralight C"},
-       {"cwrbl",       CmdHF14AMfUCWrBl,       0,"Write block - MIFARE Ultralight C"},
-       {"cauth",       CmdHF14AMfucAuth,       0,"Ultralight C Authentication"},
-       {"setpwd",      CmdHF14AMfucSetPwd , 1, "Set 3des password [Ultralight-C only]"},
-       {"setuid",      CmdHF14AMfucSetUid , 1, "Set UID"},
+       {"help",        CmdHelp,                        1, "This help"},
+       {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
+       {"info",        CmdHF14AMfUInfo,        0, "Tag information"},
+       {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C tag to binary file"},
+       {"rdbl",        CmdHF14AMfURdBl,        0, "Read block  - Ultralight"},
+       {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block - Ultralight"},    
+       {"crdbl",       CmdHF14AMfUCRdBl,       0, "Read block        - Ultralight C"},
+       {"cwrbl",       CmdHF14AMfUCWrBl,       0, "Write block       - Ultralight C"},
+       {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},
+       {"setpwd",      CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"},
+       {"setuid",      CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"},
        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
        {NULL, NULL, 0, NULL}
 };
Impressum, Datenschutz