]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
CHG: @marshmellows changes to anntations.
[proxmark3-svn] / client / cmdhfmfu.c
index 87062f098186978029fd4d76c90ce65e1dbcb008..78ce1ea0b2a0f3cf867d6a88288b30f578f467a7 100644 (file)
 #define MAX_ULEV1b_BLOCKS      0x20
 #define MAX_NTAG_213           0x2c
 #define MAX_NTAG_215           0x86
-#define MAX_NTAG_216           0xE6
+#define MAX_NTAG_216      0xe6
 
 typedef enum TAGTYPE_UL {
-       UNKNOWN         = 0,
-       UL                      = 1,
-       UL_C            = 2,
-       UL_EV1_48       = 4,
-       UL_EV1_128      = 8,
-       NTAG            = 16,
-       NTAG_213        = 32,
-       NTAG_215        = 64,
-       NTAG_216        = 128,
-       MAGIC           = 256,
+       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] = {
@@ -86,9 +85,9 @@ char* getUlev1CardSizeStr( uint8_t fsize ){
        
        // is  LSB set?
        if (  fsize & 1 )
-               sprintf(retStr, "0x%02X (%d - %d bytes)",fsize, usize, lsize);
+               sprintf(retStr, "0x%02X (%u - %u bytes)",fsize, usize, lsize);
        else 
-               sprintf(retStr, "0x%02X (%d bytes)", fsize, lsize);             
+               sprintf(retStr, "0x%02X (%u bytes)", fsize, lsize);             
        return buf;
 }
 
@@ -108,14 +107,15 @@ 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;
-
-       uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-       if (resp.arg[0] > 0) 
+       
+       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 resplen;
+       } 
+       return -1;
 }
-
+/*
 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}};
@@ -128,25 +128,22 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
 
        uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-       if (resp.arg[0] > 0)
+       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)) {
-               ul_switch_off_field();
-               return -1;
-       }
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+       if (resp.arg[0] < 0) return -1;
+       
+       memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
        
-       if (resp.arg[0] > 0) {
-               memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
-       }
        return resp.arg[0];
 }
 
@@ -207,7 +204,52 @@ static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t respo
        return len;
 }
 
-static int ul_print_CC(uint8_t *data) {
+static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
+
+       uint8_t cmd[] = {MIFARE_ULEV1_READSIG, 0x00};
+       int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+       if (len == -1)
+               ul_switch_off_field();
+       return len;
+}
+
+static int ul_print_default( uint8_t *data){
+       
+       uint8_t uid[7];
+
+       uid[0] = data[0];
+       uid[1] = data[1];
+       uid[2] = data[2];
+       uid[3] = data[4];
+       uid[4] = data[5];
+       uid[5] = data[6];
+       uid[6] = data[7];
+
+       PrintAndLog("       UID : %s ", sprint_hex(uid, 7));
+       PrintAndLog("    UID[0] : (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;
+}
+
+static int ntag_print_CC(uint8_t *data) {
        if(data[0] != 0xe1) {
                PrintAndLog("no NDEF message");
                return -1;              // no NDEF message
@@ -216,14 +258,22 @@ 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){    
+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]));
@@ -239,11 +289,11 @@ 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", (tagtype & MAGIC)?"<magic>":"" );
+               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");
+               PrintAndLog("      TYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)");
        else if ( tagtype & NTAG_213 )
                PrintAndLog("      TYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)");
        else if ( tagtype & NTAG_215 )
@@ -255,6 +305,85 @@ static int ul_print_type(uint16_t 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(" 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
+       return 0;
+}
+
+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) );
+               }
+       }
+       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;
+}
+
+static int ulev1_print_signature( uint8_t *data, uint8_t len){
+                       
+       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;
+}
+
 uint16_t GetHF14AMfU_Type(void){
 
        TagTypeUL_t tagtype = UNKNOWN;
@@ -268,6 +397,7 @@ uint16_t GetHF14AMfU_Type(void){
        status = ul_select(&card);
        if ( status < 1 ){
                PrintAndLog("Error: couldn't select");
+               ul_switch_off_field();
                return UL_ERROR;
        }
 
@@ -278,6 +408,7 @@ uint16_t GetHF14AMfU_Type(void){
        }
        
        len  = ulev1_getVersion(version, sizeof(version));
+       ul_switch_off_field();
        
        switch (len) {
                case -1:
@@ -328,6 +459,7 @@ uint16_t GetHF14AMfU_Type(void){
                } else {
                        tagtype = UL;
                }
+               ul_switch_off_field();
        }
 
        //PrintAndLog("ICE %d", tagtype);
@@ -338,13 +470,11 @@ uint16_t GetHF14AMfU_Type(void){
                //return UL_MAGIC;
        }
 
-       ul_switch_off_field();
        return tagtype;
 }      
 
 int CmdHF14AMfUInfo(const char *Cmd){
 
-       uint8_t datatemp[7] = {0x00};
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t *key;
@@ -368,86 +498,42 @@ 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");
+               PrintAndLog("Error: tag didn't answer to READ A");
                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 : 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", data[9], (data[9]==0x48)?"default":"not default" );
-       
-       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("");
-       
+       ul_print_default(data);
+
        if ((tagtype & UL_C)){
        
+               // lookup lockbits before?
                // 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");
-                       ul_switch_off_field();
-                       return status;
-               }
-       
-               PrintAndLog("--- UL-C Configuration");
-               PrintAndLog(" Higher Lockbits [40/0x28]: %s %s", sprint_hex(ulc_conf, 4), printBits(2, ulc_conf));
-               PrintAndLog("         Counter [41/0x29]: %s %s", sprint_hex(ulc_conf+4, 4), printBits(2, ulc_conf+4));
-
-               bool validAuth = (ulc_conf[8] >= 0x03 && ulc_conf[8] <= 0x30);
-               if ( validAuth )
-                       PrintAndLog("           Auth0 [42/0x2A]: %s - Pages above %d needs authentication", sprint_hex(ulc_conf+8, 4), ulc_conf[8] );
-               else{
-                       if ( ulc_conf[8] == 0){
-                               PrintAndLog("           Auth0 [42/0x2A]: %s - default", sprint_hex(ulc_conf+8, 4) );
-                       } else {
-                               PrintAndLog("           Auth0 [42/0x2A]: %s - auth byte is out-of-range", sprint_hex(ulc_conf+8, 4) );
-                       }
+                       PrintAndLog("Error: tag didn't answer to READ - possibly locked");
+               } else {
+                       ulc_print_configuration(ulc_conf);
                }
-               PrintAndLog("           Auth1 [43/0x2B]: %s - %s",
-                               sprint_hex(ulc_conf+12, 4),
-                               (ulc_conf[12] & 1) ? "write access restricted": "read and write access restricted"
-                               );
 
-               if ((tagtype & UL_C_MAGIC)){
+               if ((tagtype & MAGIC)){
 
-                       uint8_t deskey[16] = {0x00};
-                       status = ul_read(0x2C, deskey, sizeof(deskey));
+                       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");
+                               PrintAndLog("Error: tag didn't answer to READ B");
                                ul_switch_off_field();
                                return status;
                        }
-                       PrintAndLog("         deskey1 [44/0x2C]: %s", sprint_hex(deskey   ,4));
-                       PrintAndLog("         deskey1 [45/0x2D]: %s", sprint_hex(deskey+4 ,4));                 
-                       PrintAndLog("         deskey2 [46/0x2E]: %s", sprint_hex(deskey+8 ,4));
-                       PrintAndLog("         deskey2 [47/0x2F]: %s", sprint_hex(deskey+12,4));
-                       PrintAndLog(" 3des key : %s", sprint_hex(SwapEndian64(deskey, 16), 16));
+                       
+                       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){
@@ -460,18 +546,30 @@ int CmdHF14AMfUInfo(const char *Cmd){
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
                
-               PrintAndLog("--- UL-EV1 Counters");
-               uint8_t counter[4] = {0,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,4));
+               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));
+               if ( status == -1 ){
+                       PrintAndLog("Error: tag didn't answer to READ C");
+                       ul_switch_off_field();
+                       return status;
+               }               
+               ulev1_print_configuration(ulev1_conf);
+               
+               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");
+                       ul_switch_off_field();
+                       return status;
                }
+               ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
        }
        
        if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) {
 
-               PrintAndLog("\n--- UL-EV1 / NTAG Version");
-       
                uint8_t version[10] = {0x00};
                status  = ulev1_getVersion(version, sizeof(version));
                if ( status == -1 ){
@@ -503,11 +601,11 @@ int CmdHF14AMfUInfo(const char *Cmd){
                uint8_t cc[16] = {0x00};
                status = ul_read(2, cc, sizeof(cc));
                if ( status == -1 ){
-                       PrintAndLog("Error: tag didn't answer to READ");
+                       PrintAndLog("Error: tag didn't answer to READ D");
                        ul_switch_off_field();
                        return status;
-               }       
-               ul_print_CC(cc);        
+               }
+               ntag_print_CC(cc);      
        }
        
        ul_switch_off_field();
@@ -631,6 +729,11 @@ int usage_hf_mfu_dump(void)
        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;
@@ -659,10 +762,11 @@ int CmdHF14AMfUDump(const char *Cmd){
        bool tmplockbit = false;
        uint8_t dataLen=0;
        uint8_t cmdp =0;
-       //uint8_t key[16]= {0x00};
-       uint8_t *key = NULL;
+       uint8_t key[16] = {0x00};
+       uint8_t *keyPtr = key;
        size_t fileNlen = 0;
-       bool errors = FALSE;
+       bool errors = false;
+       bool swapEndian = false;
 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
@@ -677,9 +781,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        if (dataLen) {
                                errors = true; 
                        } else {
-                               //memcpy(key, data, 16);
-                               key = SwapEndian64(data, 16);
-                               PrintAndLog("3des key: %s",sprint_hex(key, 16));
+                               memcpy(key, data, 16);
                        }   
                        cmdp += 2;
                        hasPwd = true;
@@ -691,6 +793,9 @@ int CmdHF14AMfUDump(const char *Cmd){
                        if (fileNlen > FILE_PATH_SIZE-5) fileNlen = FILE_PATH_SIZE-5;
                        cmdp += 2;
                        break;
+               case 's':
+                       swapEndian = true;
+                       cmdp++;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                        errors = true;
@@ -702,6 +807,9 @@ int CmdHF14AMfUDump(const char *Cmd){
        //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;
        
@@ -736,7 +844,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                PrintAndLog("Command execute time-out");
                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]);
@@ -1067,11 +1175,11 @@ 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 00112233445566778899AABBCCDDEEFF");
@@ -1163,6 +1271,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
        if ( blockNo <= 3 ) {
                if (!chinese_card){
                         PrintAndLog("Access Denied");  
+                       return 1;
                } else {
                        PrintAndLog("--Special block no: 0x%02x", blockNo);
                        PrintAndLog("--Data: %s", sprint_hex(bldata, 4));
@@ -1174,6 +1283,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk:%02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
+                               return 1;
                        }  
                }       
        } else {
@@ -1187,6 +1297,7 @@ int CmdHF14AMfUCWrBl(const char *Cmd){
                                PrintAndLog("isOk : %02x", isOK);
                        } else {
                                PrintAndLog("Command execute timeout");
+                               return 1;
                        }
        }
        return 0;
@@ -1440,4 +1551,4 @@ int CmdHFMFUltra(const char *Cmd){
 int CmdHelp(const char *Cmd){
        CmdsHelp(CommandTable);
        return 0;
-}
\ No newline at end of file
+}
Impressum, Datenschutz