]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfu.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove binary files
[proxmark3-svn] / client / cmdhfmfu.c
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 7f0e8fc5687a927fc0bd02793fbb2df81a3de54e..191032984929b77e34a998b0b1b5bdfc29c74fba 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -94,9 +94,9 @@ char *getUlev1CardSizeStr( uint8_t fsize ){
 
        // is  LSB set?
        if (  fsize & 1 )
 
        // is  LSB set?
        if (  fsize & 1 )
-               sprintf(retStr, "%02X (%u <-> %u bytes)",fsize, usize, lsize);
+               sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
        else 
        else 
-               sprintf(retStr, "%02X (%u bytes)", fsize, lsize);               
+               sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);              
        return buf;
 }
 
        return buf;
 }
 
@@ -415,7 +415,7 @@ static int ulc_print_configuration( uint8_t *data){
        return 0;
 }
 
        return 0;
 }
 
-static int ulev1_print_configuration( uint8_t *data){
+static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
 
        PrintAndLog("\n--- Tag Configuration");
 
 
        PrintAndLog("\n--- Tag Configuration");
 
@@ -425,13 +425,13 @@ static int ulev1_print_configuration( uint8_t *data){
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];
 
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];
 
-       PrintAndLog("  cfg0 [16/0x10] : %s", sprint_hex(data, 4));
+       PrintAndLog("  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
        if ( data[3] < 0xff )
                PrintAndLog("                    - page %d and above need authentication",data[3]);
        else 
                PrintAndLog("                    - pages don't need authentication");
        PrintAndLog("                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
        if ( data[3] < 0xff )
                PrintAndLog("                    - page %d and above need authentication",data[3]);
        else 
                PrintAndLog("                    - pages don't need authentication");
        PrintAndLog("                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
-       PrintAndLog("  cfg1 [17/0x11] : %s", sprint_hex(data+4, 4) );
+       PrintAndLog("  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
        if ( authlim == 0)
                PrintAndLog("                    - Unlimited password attempts");
        else
        if ( authlim == 0)
                PrintAndLog("                    - Unlimited password attempts");
        else
@@ -439,8 +439,9 @@ static int ulev1_print_configuration( uint8_t *data){
        PrintAndLog("                    - user configuration %s", cfglck ? "permanently locked":"writeable");
        PrintAndLog("                    - %s access is protected with password", prot ? "read and write":"write");
        PrintAndLog("                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
        PrintAndLog("                    - user configuration %s", cfglck ? "permanently locked":"writeable");
        PrintAndLog("                    - %s access is protected with password", prot ? "read and write":"write");
        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));
+       PrintAndLog("  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
+       PrintAndLog("  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
+       PrintAndLog("  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
        return 0;
 }
 
        return 0;
 }
 
@@ -462,7 +463,7 @@ static int ulev1_print_counters(){
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
        PrintAndLog("\n--- Tag Signature");     
 
 static int ulev1_print_signature( uint8_t *data, uint8_t len){
        PrintAndLog("\n--- Tag Signature");     
-       PrintAndLog("IC signature public key name  : NXP NTAG21x 2013"); // don't know if there is other NXP public keys.. :(
+       //PrintAndLog("IC signature public key name  : NXP NTAG21x 2013"); // don't know if there is other NXP public keys.. :(
        PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
        PrintAndLog("    Elliptic curve parameters : secp128r1");
        PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));
        PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
        PrintAndLog("    Elliptic curve parameters : secp128r1");
        PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));
@@ -600,7 +601,7 @@ uint32_t GetHF14AMfU_Type(void){
                                        tagtype = UL;
                                } else {
                                        // read page 0x30 (should error if it is a ntag203)
                                        tagtype = UL;
                                } else {
                                        // read page 0x30 (should error if it is a ntag203)
-                                       status = ul_read(30, data, sizeof(data));
+                                       status = ul_read(0x30, data, sizeof(data));
                                        if ( status <= 1 ){
                                                tagtype = NTAG_203;
                                        } else {
                                        if ( status <= 1 ){
                                                tagtype = NTAG_203;
                                        } else {
@@ -620,7 +621,6 @@ uint32_t GetHF14AMfU_Type(void){
                }
        }
 
                }
        }
 
-
        tagtype |= ul_magic_test();
        if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
        return tagtype;
        tagtype |= ul_magic_test();
        if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
        return tagtype;
@@ -631,16 +631,19 @@ int CmdHF14AMfUInfo(const char *Cmd){
        uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
        uint8_t authlim = 0xff;
        uint8_t data[16] = {0x00};
        iso14a_card_select_t card;
-       uint8_t *key;
        int status;
        bool errors = false;
        bool hasAuthKey = false;
        bool locked = false;
        int status;
        bool errors = false;
        bool hasAuthKey = false;
        bool locked = false;
+       bool swapEndian = false;
        uint8_t cmdp = 0;
        uint8_t cmdp = 0;
-       uint8_t datalen = 0;
+       uint8_t dataLen = 0;
        uint8_t authenticationkey[16] = {0x00};
        uint8_t authenticationkey[16] = {0x00};
+       uint8_t *authkeyptr = authenticationkey;
+       uint8_t *key;
        uint8_t pack[4] = {0,0,0,0};
        uint8_t pack[4] = {0,0,0,0};
-       int len=0;
+       int len = 0;
+       char tempStr[50];
 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
 
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
@@ -651,23 +654,21 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        return usage_hf_mfu_info();
                case 'k':
                case 'K':
                        return usage_hf_mfu_info();
                case 'k':
                case 'K':
-                       // EV1/NTAG size key
-                       datalen = param_gethex(Cmd, cmdp+1, data, 8);
-                       if ( !datalen ) {
-                               memcpy(authenticationkey, data, 4);
-                               cmdp += 2;
-                               hasAuthKey = true;
-                               break;
-                       }
-                       // UL-C size key        
-                       datalen = param_gethex(Cmd, cmdp+1, data, 32);
-                       if (!datalen){
-                               memcpy(authenticationkey, data, 16);
-                               cmdp += 2;
-                               hasAuthKey = true;
-                               break;
+                       dataLen = param_getstr(Cmd, cmdp+1, tempStr);
+                       if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                               errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                               dataLen /= 2; // handled as bytes from now on
+                       } else {
+                               PrintAndLog("\nERROR: Key is incorrect length\n");
+                               errors = true;
                        }
                        }
-                       errors = true; 
+                       cmdp += 2;
+                       hasAuthKey = true;
+                       break;
+               case 'l':
+               case 'L':
+                       swapEndian = true;
+                       cmdp++;
                        break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
                        break;
                default:
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
@@ -679,7 +680,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
        //Validations
        if(errors) return usage_hf_mfu_info();
 
        //Validations
        if(errors) return usage_hf_mfu_info();
-       
+
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
@@ -687,7 +688,10 @@ int CmdHF14AMfUInfo(const char *Cmd){
        PrintAndLog("-------------------------------------------------------------");
        ul_print_type(tagtype, 6);
 
        PrintAndLog("-------------------------------------------------------------");
        ul_print_type(tagtype, 6);
 
-       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+       // Swap endianness 
+       if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
+
+       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
 
        // read pages 0,1,2,3 (should read 4pages)
        status = ul_read(0, data, sizeof(data));
 
        // read pages 0,1,2,3 (should read 4pages)
        status = ul_read(0, data, sizeof(data));
@@ -698,7 +702,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
        } else if (status == 16) {
                ul_print_default(data);
                ndef_print_CC(data+12);
        } else if (status == 16) {
                ul_print_default(data);
                ndef_print_CC(data+12);
-       }       else {
+       } else {
                locked = true;
        }
 
                locked = true;
        }
 
@@ -732,6 +736,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
 
                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
 
+                       // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
                        PrintAndLog("Trying some default 3des keys");
                        for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
                                key = default_3des_keys[i];
                        PrintAndLog("Trying some default 3des keys");
                        for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
                                key = default_3des_keys[i];
@@ -740,11 +745,10 @@ int CmdHF14AMfUInfo(const char *Cmd){
                                        uint8_t keySwap[16];
                                        memcpy(keySwap, SwapEndian64(key,16,8), 16);
                                        ulc_print_3deskey(keySwap);
                                        uint8_t keySwap[16];
                                        memcpy(keySwap, SwapEndian64(key,16,8), 16);
                                        ulc_print_3deskey(keySwap);
-                                       break;
+                                       return 1;
                                } 
                        }
                                } 
                        }
-                       // reselect for future tests (ntag test)
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       return 1;
                }
        }
 
                }
        }
 
@@ -754,7 +758,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
                if (ulev1_print_counters() != 3) {
                        // failed - re-select
        if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
                if (ulev1_print_counters() != 3) {
                        // failed - re-select
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                }
        }
 
                }
        }
 
@@ -769,7 +773,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
                else {
                        // re-select
                if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
                else {
                        // re-select
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                }
        }
 
                }
        }
 
@@ -784,7 +788,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        ulev1_print_version(version);
                } else {
                        locked = true;
                        ulev1_print_version(version);
                } else {
                        locked = true;
-                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                }
 
                uint8_t startconfigblock = 0;
                }
 
                uint8_t startconfigblock = 0;
@@ -803,7 +807,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        } else if (status == 16) {
                                // save AUTHENTICATION LIMITS for later:
                                authlim = (ulev1_conf[4] & 0x07);
                        } else if (status == 16) {
                                // save AUTHENTICATION LIMITS for later:
                                authlim = (ulev1_conf[4] & 0x07);
-                               ulev1_print_configuration(ulev1_conf);
+                               ulev1_print_configuration(ulev1_conf, startconfigblock);
                        }
                }
 
                        }
                }
 
@@ -821,7 +825,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
                                        PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
                                        break;
                                } else {
                                        PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
                                        break;
                                } else {
-                                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+                                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                                }
                        }
                        if (len < 1) PrintAndLog("password not known");
                                }
                        }
                        if (len < 1) PrintAndLog("password not known");
@@ -945,32 +949,33 @@ int CmdHF14AMfURdBl(const char *Cmd){
        return 0;
 }
 
        return 0;
 }
 
-int usage_hf_mfu_info(void)
-{
+int usage_hf_mfu_info(void) {
        PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
        PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
        PrintAndLog("The following tags can be identified:\n");
        PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
        PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
        PrintAndLog("The following tags can be identified:\n");
-       PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1");
-       PrintAndLog("NTAG 213, NTAG 215, NTAG 216");
+       PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
+       PrintAndLog("NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
        PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");
        PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");
-       PrintAndLog("Usage:  hf mfu info k <key>");
+       PrintAndLog("Usage:  hf mfu info k <key> l");
        PrintAndLog("  Options : ");
        PrintAndLog("  Options : ");
-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : (optional) swap entered key's endianness");
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu info");
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu info");
-       PrintAndLog("          : hf mfu info k 11223344");
+       PrintAndLog("          : hf mfu info k 00112233445566778899AABBCCDDEEFF");
+       PrintAndLog("          : hf mfu info k AABBCCDDD");
        return 0;
 }
 
        return 0;
 }
 
-int usage_hf_mfu_dump(void)
-{
+int usage_hf_mfu_dump(void) {
        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
        PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
+       PrintAndLog("NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
-       PrintAndLog("Usage:  hf mfu dump l k <key> n <filename w/o .bin>");
+       PrintAndLog("Usage:  hf mfu dump k <key> l n <filename w/o .bin>");
        PrintAndLog("  Options : ");
        PrintAndLog("  Options : ");
-       PrintAndLog("  k <key> : key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
-       PrintAndLog("  l       : swap entered key's endianness for auth");
+       PrintAndLog("  k <key> : (optional) key for authentication [UL-C 16bytes, EV1/NTAG 4bytes]");
+       PrintAndLog("  l       : (optional) swap entered key's endianness");
        PrintAndLog("  n <FN > : filename w/o .bin to save the dump as");       
        PrintAndLog("  p <Pg > : starting Page number to manually set a page to start the dump at");    
        PrintAndLog("  q <qty> : number of Pages to manually set how many pages to dump");      
        PrintAndLog("  n <FN > : filename w/o .bin to save the dump as");       
        PrintAndLog("  p <Pg > : starting Page number to manually set a page to start the dump at");    
        PrintAndLog("  q <qty> : number of Pages to manually set how many pages to dump");      
@@ -979,6 +984,7 @@ int usage_hf_mfu_dump(void)
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
        PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
        PrintAndLog("          : hf mfu dump k 00112233445566778899AABBCCDDEEFF");
+       PrintAndLog("          : hf mfu dump k AABBCCDDD\n");
        return 0;
 }
 
        return 0;
 }
 
@@ -997,14 +1003,14 @@ int CmdHF14AMfUDump(const char *Cmd){
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
        uint8_t data[1024] = {0x00};
        bool bit[16]  = {0x00};
        bool bit2[16] = {0x00};
        uint8_t data[1024] = {0x00};
-       bool hasPwd = false;
+       bool hasAuthKey = false;
        int i = 0;
        int Pages = 16;
        bool tmplockbit = 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;
+       uint8_t dataLen = 0;
+       uint8_t cmdp = 0;
+       uint8_t authenticationkey[16] = {0x00};
+       uint8_t *authKeyPtr = authenticationkey;
        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;
        size_t fileNlen = 0;
        bool errors = false;
        bool swapEndian = false;
@@ -1022,17 +1028,15 @@ int CmdHF14AMfUDump(const char *Cmd){
                case 'k':
                case 'K':
                        dataLen = param_getstr(Cmd, cmdp+1, tempStr);
                case 'k':
                case 'K':
                        dataLen = param_getstr(Cmd, cmdp+1, tempStr);
-                       if (dataLen == 32) //ul-c
-                               errors = param_gethex(tempStr, 0, key, dataLen);
-                       else if (dataLen == 8) //ev1/ntag
-                               errors = param_gethex(tempStr, 0, key, dataLen);
-                       else{
+                       if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+                               errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+                               dataLen /= 2;
+                       } else {
                                PrintAndLog("\nERROR: Key is incorrect length\n");
                                errors = true;
                        }
                                PrintAndLog("\nERROR: Key is incorrect length\n");
                                errors = true;
                        }
-                               
                        cmdp += 2;
                        cmdp += 2;
-                       hasPwd = true;
+                       hasAuthKey = true;
                        break;
                case 'l':
                case 'L':
                        break;
                case 'l':
                case 'L':
@@ -1069,8 +1073,8 @@ int CmdHF14AMfUDump(const char *Cmd){
        //Validations
        if(errors) return usage_hf_mfu_dump();
 
        //Validations
        if(errors) return usage_hf_mfu_dump();
 
-       if (swapEndian && dataLen == 32)
-               keyPtr = SwapEndian64(data, 16, 8);
+       if (swapEndian && hasAuthKey) 
+               authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
@@ -1083,13 +1087,13 @@ int CmdHF14AMfUDump(const char *Cmd){
        ul_print_type(tagtype, 0);
        PrintAndLog("Reading tag memory...");
        UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
        ul_print_type(tagtype, 0);
        PrintAndLog("Reading tag memory...");
        UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
-       if ( hasPwd ) {
+       if ( hasAuthKey ) {
                if (tagtype & UL_C)
                        c.arg[2] = 1; //UL_C auth
                else
                        c.arg[2] = 2; //UL_EV1/NTAG auth
 
                if (tagtype & UL_C)
                        c.arg[2] = 1; //UL_C auth
                else
                        c.arg[2] = 2; //UL_EV1/NTAG auth
 
-               memcpy(c.d.asBytes, key, dataLen/2);
+               memcpy(c.d.asBytes, authKeyPtr, dataLen);
        }
        SendCommand(&c);
        UsbCommand resp;
        }
        SendCommand(&c);
        UsbCommand resp;
@@ -1102,12 +1106,13 @@ int CmdHF14AMfUDump(const char *Cmd){
                return 1;
        }
 
                return 1;
        }
 
+       uint32_t startindex = resp.arg[2];
        uint32_t bufferSize = resp.arg[1];
        if (bufferSize > sizeof(data)) {
                PrintAndLog("Data exceeded Buffer size!");
                bufferSize = sizeof(data);
        }
        uint32_t bufferSize = resp.arg[1];
        if (bufferSize > sizeof(data)) {
                PrintAndLog("Data exceeded Buffer size!");
                bufferSize = sizeof(data);
        }
-       GetFromBigBuf(data, bufferSize, 0);
+       GetFromBigBuf(data, bufferSize, startindex);
        WaitForResponse(CMD_ACK,NULL);
 
        Pages = bufferSize/4;
        WaitForResponse(CMD_ACK,NULL);
 
        Pages = bufferSize/4;
@@ -1133,12 +1138,19 @@ int CmdHF14AMfUDump(const char *Cmd){
        }
 
        // add keys to block dump
        }
 
        // add keys to block dump
-       if (hasPwd && (tagtype & UL_C)) { //UL_C
-               memcpy(data + Pages*4, key, dataLen/2);
-               Pages += 4;
-       } else if (hasPwd) { //not sure output is in correct location.
-               memcpy(data + Pages*4, key, dataLen/2);
-               Pages += 1;
+       if (hasAuthKey) {
+               if (!swapEndian){
+                       authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
+               } else {
+                       authKeyPtr = authenticationkey;
+               }
+
+               if (tagtype & UL_C){ //add 4 pages
+                       memcpy(data + Pages*4, authKeyPtr, dataLen);
+                       Pages += dataLen/4;  
+               } else { // 2nd page from end
+                       memcpy(data + (Pages*4) - 8, authenticationkey, dataLen);
+               }
        }
 
        for (i = 0; i < Pages; ++i) {
        }
 
        for (i = 0; i < Pages; ++i) {
@@ -1148,11 +1160,11 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
                switch(i){
                        case 3: tmplockbit = bit[4]; break;
                }
                switch(i){
                        case 3: tmplockbit = bit[4]; break;
-                       case 4: tmplockbit = bit[3]; break;
-                       case 5: tmplockbit = bit[2]; break;
-                       case 6: tmplockbit = bit[1]; break;
-                       case 7: tmplockbit = bit[0]; break;
-                       case 8: tmplockbit = bit[15]; break;
+                       case 4: tmplockbit = bit[3]; break;
+                       case 5: tmplockbit = bit[2]; break;
+                       case 6: tmplockbit = bit[1]; break;
+                       case 7: tmplockbit = bit[0]; break;
+                       case 8: tmplockbit = bit[15]; break;
                        case 9: tmplockbit = bit[14]; break;
                        case 10: tmplockbit = bit[13]; break;
                        case 11: tmplockbit = bit[12]; break;
                        case 9: tmplockbit = bit[14]; break;
                        case 10: tmplockbit = bit[13]; break;
                        case 11: tmplockbit = bit[12]; break;
@@ -1171,7 +1183,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 24:
                        case 25:
                        case 26:
                        case 24:
                        case 25:
                        case 26:
-                       case 27: tmplockbit = bit2[4]; break;               
+                       case 27: tmplockbit = bit2[4]; break;
                        case 28:
                        case 29:
                        case 30:
                        case 28:
                        case 29:
                        case 30:
@@ -1190,8 +1202,8 @@ int CmdHF14AMfUDump(const char *Cmd){
                        case 43: tmplockbit = bit2[9]; break;  //auth1
                        default: break;
                }
                        case 43: tmplockbit = bit2[9]; break;  //auth1
                        default: break;
                }
-               PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),tmplockbit);
-       }  
+               PrintAndLog("Block %02X:%s [%d] {%.4s}", i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
+       }
 
        // user supplied filename?
        if (fileNlen < 1) {
 
        // user supplied filename?
        if (fileNlen < 1) {
@@ -1204,7 +1216,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
                PrintAndLog("Could not create file name %s", filename);
-               return 1;       
+               return 1;
        }
        fwrite( data, 1, Pages*4, fout );
        fclose(fout);
        }
        fwrite( data, 1, Pages*4, fout );
        fclose(fout);
Proxmark3 GIT tracking
Impressum, Datenschutz