REM: Removed lot of obselete code from before.

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 5bb9a91e7892fcd0713d78ba10641c650eb18474..c7de6c7dc62a9771d1abe261b62ca3697b78d6c6 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -41,20 +41,9 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
                { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
 };
 
                { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }     // 11 22 33
 };
 

-#define KEYS_PWD_COUNT 10
+#define KEYS_PWD_COUNT 1

 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
        {0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default

-
-       {0x4A,0xF8,0x4B,0x19}, // PACK 0xE5,0xBE -- italian bus (sniffed)
-       {0x33,0x6B,0xA1,0x19}, // PACK 0x9c,0x2d -- italian bus (sniffed)
-       {0xFF,0x90,0x6C,0xB2}, // PACK 0x12,0x9e -- italian bus (sniffed)       
-       {0x46,0x1c,0xA3,0x19}, // PACK 0xE9,0x5A -- italian bus (sniffed)
-       {0x35,0x1C,0xD0,0x19}, // PACK 0x9A,0x5a -- italian bus (sniffed)
-
-       {0x05,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- Amiiboo (sniffed) pikachu-b UID:
-       {0x7E,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
-       {0x02,0xE1,0xEE,0x36}, // PACK 0x80,0x80 -- AMiiboo (sniffed) sonic UID:  04d257 7ae33e8027
-       {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 

 };
 
 #define MAX_UL_TYPES 18
 };
 
 #define MAX_UL_TYPES 18


@@ -74,6 +63,77 @@ uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
                MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE,
                MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};
 
                MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE,
                MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};
 

+// Certain pwd generation algo nickname A.
+uint32_t ul_ev1_pwdgenA(uint8_t* uid) { 
+
+       uint8_t pos = (uid[3] ^ uid[4] ^ uid[5] ^ uid[6]) % 32;
+       
+       uint32_t xortable[] = {
+                                               0x4f2711c1, 0x07D7BB83, 0x9636EF07, 0xB5F4460E, 0xF271141C, 0x7D7BB038, 0x636EF871, 0x5F4468E3,
+                                               0x271149C7, 0xD7BB0B8F, 0x36EF8F1E, 0xF446863D, 0x7114947A, 0x7BB0B0F5, 0x6EF8F9EB, 0x44686BD7,
+                                               0x11494fAF, 0xBB0B075F, 0xEF8F96BE, 0x4686B57C, 0x1494F2F9, 0xB0B07DF3, 0xF8F963E6, 0x686B5FCC,
+                                               0x494F2799, 0x0B07D733, 0x8F963667, 0x86B5F4CE, 0x94F2719C, 0xB07D7B38, 0xF9636E70, 0x6B5F44E0
+                                               };
+
+       uint8_t entry[] = {0x00,0x00,0x00,0x00};
+       uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+       
+       num_to_bytes( xortable[pos], 4, entry);
+
+       pwd[0] = entry[0] ^ uid[1] ^ uid[2] ^ uid[3];
+       pwd[1] = entry[1] ^ uid[0] ^ uid[2] ^ uid[4];
+       pwd[2] = entry[2] ^ uid[0] ^ uid[1] ^ uid[5];
+       pwd[3] = entry[3] ^ uid[6];
+
+       return (uint32_t)bytes_to_num(pwd, 4);
+}
+
+// Certain pwd generation algo nickname B. (very simple)
+uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
+
+       uint8_t pwd[] = {0x00,0x00,0x00,0x00};
+       
+       pwd[0] = uid[1] ^ uid[3] ^ 0xAA;
+       pwd[1] = uid[2] ^ uid[4] ^ 0x55;
+       pwd[2] = uid[3] ^ uid[5] ^ 0xAA;
+       pwd[3] = uid[4] ^ uid[6] ^ 0x55;
+       return (uint32_t)bytes_to_num(pwd, 4);
+}
+
+// Certain pwd generation algo nickname C.
+uint32_t ul_ev1_pwdgenC(uint8_t* uid){
+       uint32_t pwd = 0;
+       uint8_t base[] = {
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
+               0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72,
+               0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47,
+               0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa
+       };
+
+       memcpy(base, uid, 7);
+
+       for (int i = 0; i < 32; i += 4) {
+               uint32_t b = *(uint32_t *)(base + i);
+               pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd;
+       }
+       return BSWAP_32(pwd);
+}
+
+void ul_ev1_pwdgen_selftest(){
+       
+       uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10};
+       uint32_t pwd1 = ul_ev1_pwdgenA(uid1);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid1,7), pwd1, (pwd1 == 0x8432EB17)?"OK":"->8432EB17<-");
+
+       uint8_t uid2[] = {0x04,0x1f,0x98,0xea,0x1e,0x3e,0x81};          
+       uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
+
+       uint8_t uid3[] = {0x04,0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
+       uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");
+       return;
+}

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -220,7 +280,7 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
                if ( !ul_select(card) ) return 0;
 
                if (hasAuthKey) {
                if ( !ul_select(card) ) return 0;
 
                if (hasAuthKey) {

-                       if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 1) {
+                       if (ulev1_requestAuthentication(authenticationkey, pack, packSize) < 2) {

                                ul_switch_off_field();
                                PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
                                return 0;
                                ul_switch_off_field();
                                PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
                                return 0;


@@ -237,16 +297,6 @@ static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
        return len;
 }
 

-// static int ulev1_fastRead( uint8_t startblock, uint8_t endblock, uint8_t *response ){
-       
-       // uint8_t cmd[] = {MIFARE_ULEV1_FASTREAD, startblock, endblock};
-       
-       // if ( !ul_send_cmd_raw(cmd, sizeof(cmd), response)){
-               // 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};
 static int ulev1_readCounter( uint8_t counter, uint8_t *response, uint16_t responseLength ){
 
        uint8_t cmd[] = {MIFARE_ULEV1_READ_CNT, counter};


@@ -268,7 +318,6 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
        return len;
 }
 
        return len;
 }
 

-

 // Fudan check checks for which error is given for a command with incorrect crc
 // NXP UL chip responds with 01, fudan 00.
 // other possible checks:
 // Fudan check checks for which error is given for a command with incorrect crc
 // NXP UL chip responds with 01, fudan 00.
 // other possible checks:


@@ -338,12 +387,12 @@ static int ul_print_default( uint8_t *data){
 
        PrintAndLog("      Lock : %s - %s",
                                sprint_hex(data+10, 2),
 
        PrintAndLog("      Lock : %s - %s",
                                sprint_hex(data+10, 2),

-                               printBits(2, data+10)
+                               sprint_bin(data+10, 2)

                );
 
        PrintAndLog("OneTimePad : %s - %s\n",
                                sprint_hex(data + 12, 4),
                );
 
        PrintAndLog("OneTimePad : %s - %s\n",
                                sprint_hex(data + 12, 4),

-                               printBits(4, data+12)
+                               sprint_bin(data+12, 4)

                );
 
        return 0;
                );
 
        return 0;


@@ -434,8 +483,8 @@ static int ulc_print_3deskey( uint8_t *data){
 static int ulc_print_configuration( uint8_t *data){
 
        PrintAndLog("--- UL-C Configuration");
 static int ulc_print_configuration( uint8_t *data){
 
        PrintAndLog("--- UL-C Configuration");

-       PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), printBits(2, data));
-       PrintAndLog("         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), printBits(2, data+4));
+       PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), sprint_bin(data, 2));
+       PrintAndLog("         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), sprint_bin(data+4, 2));

 
        bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
        if ( validAuth )
 
        bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
        if ( validAuth )


@@ -460,6 +509,8 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
 
        bool strg_mod_en = (data[0] & 2);
        uint8_t authlim = (data[4] & 0x07);
 
        bool strg_mod_en = (data[0] & 2);
        uint8_t authlim = (data[4] & 0x07);

+       bool nfc_cnf_en = (data[4] & 0x08);
+       bool nfc_cnf_prot_pwd = (data[4] & 0x10);

        bool cfglck = (data[4] & 0x40);
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];
        bool cfglck = (data[4] & 0x40);
        bool prot = (data[4] & 0x80);
        uint8_t vctid = data[5];


@@ -475,6 +526,10 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
                PrintAndLog("                    - Unlimited password attempts");
        else
                PrintAndLog("                    - Max number of password attempts is %d", authlim);
                PrintAndLog("                    - Unlimited password attempts");
        else
                PrintAndLog("                    - Max number of password attempts is %d", authlim);

+       
+       PrintAndLog("                    - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
+       PrintAndLog("                    - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
+       

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


@@ -686,7 +741,8 @@ int CmdHF14AMfUInfo(const char *Cmd){
        uint8_t dataLen = 0;
        uint8_t authenticationkey[16] = {0x00};
        uint8_t *authkeyptr = authenticationkey;
        uint8_t dataLen = 0;
        uint8_t authenticationkey[16] = {0x00};
        uint8_t *authkeyptr = authenticationkey;

-       uint8_t *key;
+       uint8_t pwd[4] = {0,0,0,0};
+       uint8_t *key = pwd;

        uint8_t pack[4] = {0,0,0,0};
        int len = 0;
        char tempStr[50];
        uint8_t pack[4] = {0,0,0,0};
        int len = 0;
        char tempStr[50];


@@ -866,6 +922,31 @@ int CmdHF14AMfUInfo(const char *Cmd){
                if ( !authlim && !hasAuthKey ) {
                        PrintAndLog("\n--- Known EV1/NTAG passwords.");
                        len = 0;
                if ( !authlim && !hasAuthKey ) {
                        PrintAndLog("\n--- Known EV1/NTAG passwords.");
                        len = 0;

+                       
+                       // test pwd gen A
+                       num_to_bytes( ul_ev1_pwdgenA(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+                       
+                       // test pwd gen B
+                       num_to_bytes( ul_ev1_pwdgenB(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+
+                       // test pwd gen C
+                       num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;                    
+                       

                        for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
                                key = default_pwd_pack[i];
                                len = ulev1_requestAuthentication(key, pack, sizeof(pack));
                        for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
                                key = default_pwd_pack[i];
                                len = ulev1_requestAuthentication(key, pack, sizeof(pack));


@@ -1153,14 +1234,13 @@ int usage_hf_mfu_dump(void) {
        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("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("Usage:  hf mfu dump k <key> l n <filename w/o .bin>");
-       PrintAndLog("  Options : ");
+       PrintAndLog("Usage:  hf mfu dump k <key> l n <filename w/o .bin> p <page#> q <#pages>");
+       PrintAndLog("  Options :");

        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("  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("");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");
        PrintAndLog("");
        PrintAndLog("   sample : hf mfu dump");
        PrintAndLog("          : hf mfu dump n myfile");


@@ -1198,17 +1278,76 @@ int usage_hf_mfu_wrbl(void) {
 }
 
 int usage_hf_mfu_eload(void) {
 }
 
 int usage_hf_mfu_eload(void) {

-       PrintAndLog("It loads emulator dump from the file `filename.eml`\n");
-       PrintAndLog("Usage:  hf mfu eload t <card memory> i <file name w/o `.eml`>\n");
-       PrintAndLog("  Options:");      
-       PrintAndLog("  t <card memory> : Tag memorysize/type");
-       PrintAndLog("  i <file>        : file name w/o `.eml`");
+       PrintAndLog("It loads emul dump from the file `filename.eml`");
+       PrintAndLog("Hint: See script dumptoemul-mfu.lua to convert the .bin to the eml");
+       PrintAndLog("Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
+       PrintAndLog("  Options:");
+       PrintAndLog("    h          : this help");      
+       PrintAndLog("    u          : UL (required)");
+       PrintAndLog("    [filename] : without `.eml` (required)");      
+       PrintAndLog("    numblocks  : number of blocks to load from eml file (optional)");
+       PrintAndLog("");
+       PrintAndLog("  sample: hf mfu eload u filename");
+       PrintAndLog("          hf mfu eload u filename 57");
+                       return 0;
+}
+
+int usage_hf_mfu_sim(void) {
+       PrintAndLog("\nEmulating Ultralight tag from emulator memory\n");
+       PrintAndLog("\nBe sure to load the emulator memory first!\n");
+       PrintAndLog("Usage: hf mfu sim t 7 u <uid>");
+       PrintAndLog("  Options:");
+       PrintAndLog("    h       : this help");
+       PrintAndLog("    t 7     : 7 = NTAG or Ultralight sim (required)");
+       PrintAndLog("    u <uid> : 4 or 7 byte UID (optional)");
+       PrintAndLog("\n   sample : hf mfu sim t 7");
+       PrintAndLog("          : hf mfu sim t 7 u 1122344556677\n");
+       
+       return 0;
+}
+
+int usage_hf_mfu_ucauth(void) {
+       PrintAndLog("Usage:  hf mfu cauth k <key number>");
+       PrintAndLog("      0 (default): 3DES standard key");
+       PrintAndLog("      1 : all 0x00 key");
+       PrintAndLog("      2 : 0x00-0x0F key");
+       PrintAndLog("      3 : nfc key");
+       PrintAndLog("      4 : all 0x01 key");
+       PrintAndLog("      5 : all 0xff key");
+       PrintAndLog("      6 : 0x00-0xFF key");         
+       PrintAndLog("\n      sample : hf mfu cauth k");
+       PrintAndLog("               : hf mfu cauth k 3");
+       return 0;
+}
+
+int usage_hf_mfu_ucsetpwd(void) {
+       PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
+       PrintAndLog("       [password] - (32 hex symbols)");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu setpwd 000102030405060708090a0b0c0d0e0f");

        PrintAndLog("");
        PrintAndLog("");

-       PrintAndLog("    sample : hf mfu eload filename");
-       PrintAndLog("           : hf mfu eload 4 filename");

        return 0;
 }
 
        return 0;
 }
 

+int usage_hf_mfu_ucsetuid(void) {
+       PrintAndLog("Usage:  hf mfu setuid <uid (14 hex symbols)>");
+       PrintAndLog("       [uid] - (14 hex symbols)");
+       PrintAndLog("\nThis only works for Magic Ultralight tags.");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu setuid 11223344556677");
+       PrintAndLog("");
+       return 0;
+}
+
+int  usage_hf_mfu_gendiverse(void){
+       PrintAndLog("Usage:  hf mfu gen <uid (8 hex symbols)>");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu gen 11223344");
+       PrintAndLog("");
+       return 0;
+}
+
+#define DUMP_PREFIX_LENGTH 48 

 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 //  Read and Dump Card Contents,  using auto detection of tag size.


@@ -1231,6 +1370,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        uint8_t dataLen = 0;
        uint8_t cmdp = 0;
        uint8_t authenticationkey[16] = {0x00};
        uint8_t dataLen = 0;
        uint8_t cmdp = 0;
        uint8_t authenticationkey[16] = {0x00};

+       memset(authenticationkey, 0x00, sizeof(authenticationkey));

        uint8_t *authKeyPtr = authenticationkey;
        size_t fileNlen = 0;
        bool errors = false;
        uint8_t *authKeyPtr = authenticationkey;
        size_t fileNlen = 0;
        bool errors = false;


@@ -1272,7 +1412,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                        cmdp += 2;
                        break;
                case 'p':
                        cmdp += 2;
                        break;
                case 'p':

-               case 'P':
+               case 'P': //set start page

                        startPage = param_get8(Cmd, cmdp+1);
                        manualPages = true;
                        cmdp += 2;
                        startPage = param_get8(Cmd, cmdp+1);
                        manualPages = true;
                        cmdp += 2;


@@ -1294,6 +1434,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        //Validations
        if(errors) return usage_hf_mfu_dump();
 
        //Validations
        if(errors) return usage_hf_mfu_dump();
 

+       //if we entered a key in little endian and set the swapEndian switch - switch it...

        if (swapEndian && hasAuthKey) 
                authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
        if (swapEndian && hasAuthKey) 
                authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 


@@ -1360,8 +1501,51 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
                }
        }
 

-       // add keys to block dump
+       uint8_t get_pack[] = {0,0};
+       iso14a_card_select_t card;
+       uint8_t dump_file_data[1024+DUMP_PREFIX_LENGTH] = {0x00};
+       uint8_t get_version[] = {0,0,0,0,0,0,0,0,0};
+       uint8_t get_tearing[] = {0,0,0};
+       uint8_t get_counter[] = {0,0,0};
+       uint8_t dummy_pack[] = {0,0};
+       uint8_t get_signature[32];
+       memset( get_signature, 0, sizeof(get_signature) );
+
+       // not ul_c and not std ul then attempt to get deeper info
+       if (!(tagtype & UL_C || tagtype & UL)) {
+               //attempt to read pack
+               if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
+                       //reset pack
+                       get_pack[0]=0;
+                       get_pack[1]=0;
+               }
+               ul_switch_off_field();
+               // add pack to block read
+               memcpy(data + (Pages*4) - 4, get_pack, sizeof(get_pack));
+       if ( hasAuthKey )
+               ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+       else
+               ul_select(&card);
+
+       ulev1_getVersion( get_version, sizeof(get_version) );
+       for ( uint8_t i = 0; i<3; ++i) {
+               ulev1_readTearing(i, get_tearing+i, 1);
+               ulev1_readCounter(i, get_counter, sizeof(get_counter) );
+       }
+       ul_switch_off_field();
+       if ( hasAuthKey )
+               ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
+       else
+               ul_select(&card);
+       ulev1_readSignature( get_signature, sizeof(get_signature));
+       ul_switch_off_field();
+       }
+
+       // format and add keys to block dump output

        if (hasAuthKey) {
        if (hasAuthKey) {

+               // if we didn't swapendian before - do it now for the sprint_hex call
+               // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
+               //       need to swap to keep it the same

                if (!swapEndian){
                        authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
                } else {
                if (!swapEndian){
                        authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
                } else {


@@ -1376,6 +1560,35 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
                }
        }
 

+       //add *special* blocks to dump
+       //get version
+       memcpy(dump_file_data, get_version, sizeof(get_version));
+       //tearing
+       memcpy(dump_file_data+10, get_tearing, sizeof(get_tearing));
+       //pack
+       memcpy(dump_file_data+13, get_pack, sizeof(get_pack));
+       //signature
+       memcpy(dump_file_data+16, get_signature, sizeof(get_signature));
+       //add regular block read data to dump
+       memcpy(dump_file_data+DUMP_PREFIX_LENGTH, data, Pages*4);
+
+       PrintAndLog("\n*Special* block data:");
+       PrintAndLog("\nDataType| Data        |   | Ascii");
+       PrintAndLog("---------------------------------");
+       PrintAndLog("GetVer-1| %s|   | %.4s", sprint_hex(dump_file_data, 4), dump_file_data);
+       PrintAndLog("GetVer-2| %s|   | %.4s", sprint_hex(dump_file_data+4, 4), dump_file_data+4);
+       PrintAndLog("TBD     | 00 00       |   | ");
+       PrintAndLog("Tearing |    %s|   | %.3s", sprint_hex(dump_file_data+10, 3), dump_file_data+10);
+       PrintAndLog("Pack    |    %s   |   | %.2s", sprint_hex(dump_file_data+13, 2), dump_file_data+13);
+       PrintAndLog("TBD     |          00 |   | ");
+       PrintAndLog("Sig-1   | %s|   | %.4s", sprint_hex(dump_file_data+16, 4), dump_file_data+16);
+       PrintAndLog("Sig-2   | %s|   | %.4s", sprint_hex(dump_file_data+20, 4), dump_file_data+20);
+       PrintAndLog("Sig-3   | %s|   | %.4s", sprint_hex(dump_file_data+24, 4), dump_file_data+24);
+       PrintAndLog("Sig-4   | %s|   | %.4s", sprint_hex(dump_file_data+28, 4), dump_file_data+28);
+       PrintAndLog("Sig-5   | %s|   | %.4s", sprint_hex(dump_file_data+32, 4), dump_file_data+32);
+       PrintAndLog("Sig-6   | %s|   | %.4s", sprint_hex(dump_file_data+36, 4), dump_file_data+36);
+       PrintAndLog("Sig-7   | %s|   | %.4s", sprint_hex(dump_file_data+40, 4), dump_file_data+40);
+       PrintAndLog("Sig-8   | %s|   | %.4s", sprint_hex(dump_file_data+44, 4), dump_file_data+44);

        PrintAndLog("\nBlock#  | Data        |lck| Ascii");
        PrintAndLog("---------------------------------");
        for (i = 0; i < Pages; ++i) {
        PrintAndLog("\nBlock#  | Data        |lck| Ascii");
        PrintAndLog("---------------------------------");
        for (i = 0; i < Pages; ++i) {


@@ -1444,10 +1657,10 @@ int CmdHF14AMfUDump(const char *Cmd){
                PrintAndLog("Could not create file name %s", filename);
                return 1;
        }
                PrintAndLog("Could not create file name %s", filename);
                return 1;
        }

-       fwrite( data, 1, Pages*4, fout );
+       fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout );

        fclose(fout);
        
        fclose(fout);
        

-       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages, Pages*4, filename);
+       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+(DUMP_PREFIX_LENGTH/4), Pages*4 + DUMP_PREFIX_LENGTH, filename);

        return 0;
 }
 
        return 0;
 }
 


@@ -1472,22 +1685,9 @@ int CmdHF14AMfucAuth(const char *Cmd){
                        errors = true;
        }
 
                        errors = true;
        }
 

-       if (cmdp == 'h' || cmdp == 'H')
-               errors = true;
+       if (cmdp == 'h' || cmdp == 'H') errors = true;

        
        

-       if (errors) {
-               PrintAndLog("Usage:  hf mfu cauth k <key number>");
-               PrintAndLog("      0 (default): 3DES standard key");
-               PrintAndLog("      1 : all 0x00 key");
-               PrintAndLog("      2 : 0x00-0x0F key");
-               PrintAndLog("      3 : nfc key");
-               PrintAndLog("      4 : all 0x01 key");
-               PrintAndLog("      5 : all 0xff key");
-               PrintAndLog("      6 : 0x00-0xFF key");         
-               PrintAndLog("\n      sample : hf mfu cauth k");
-               PrintAndLog("               : hf mfu cauth k 3");
-               return 0;
-       } 
+       if (errors) return usage_hf_mfu_ucauth(); 

 
        uint8_t *key = default_3des_keys[keyNo];
        if (ulc_authentication(key, true))
 
        uint8_t *key = default_3des_keys[keyNo];
        if (ulc_authentication(key, true))


@@ -1601,17 +1801,9 @@ int CmdTestDES(const char * cmd)
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
        uint8_t pwd[16] = {0x00};       
 int CmdHF14AMfucSetPwd(const char *Cmd){
 
        uint8_t pwd[16] = {0x00};       

-       

        char cmdp = param_getchar(Cmd, 0);
 
        char cmdp = param_getchar(Cmd, 0);
 

-       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
-               PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
-               PrintAndLog("       [password] - (32 hex symbols)");
-               PrintAndLog("");
-               PrintAndLog("sample: hf mfu setpwd 000102030405060708090a0b0c0d0e0f");
-               PrintAndLog("");
-               return 0;
-       }
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetpwd();

        
        if (param_gethex(Cmd, 0, pwd, 32)) {
                PrintAndLog("Password must include 32 HEX symbols");
        
        if (param_gethex(Cmd, 0, pwd, 32)) {
                PrintAndLog("Password must include 32 HEX symbols");


@@ -1624,20 +1816,17 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
        SendCommand(&c);
 
        UsbCommand resp;
        SendCommand(&c);
 
        UsbCommand resp;

-       

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {

-               if ( (resp.arg[0] & 0xff) == 1)
+               if ( (resp.arg[0] & 0xff) == 1) {

                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));
                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));

-               else{
+               } else {

                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }
                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }

-       }
-       else {
+       } else {

                PrintAndLog("command execution time out");
                return 1;
                PrintAndLog("command execution time out");
                return 1;

-       }
-       
+       }       

        return 0;
 }
 
        return 0;
 }
 


@@ -1651,16 +1840,8 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        

-       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {  
-               PrintAndLog("Usage:  hf mfu setuid <uid (14 hex symbols)>");
-               PrintAndLog("       [uid] - (14 hex symbols)");
-               PrintAndLog("\nThis only works for Magic Ultralight tags.");
-               PrintAndLog("");
-               PrintAndLog("sample: hf mfu setuid 11223344556677");
-               PrintAndLog("");
-               return 0;
-       }
-       
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid();
+

        if (param_gethex(Cmd, 0, uid, 14)) {
                PrintAndLog("UID must include 14 HEX symbols");
                return 1;
        if (param_gethex(Cmd, 0, uid, 14)) {
                PrintAndLog("UID must include 14 HEX symbols");
                return 1;


@@ -1724,14 +1905,19 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 }
 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){

+
+       uint8_t uid[4]; 
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse();
+
+       if (param_gethex(Cmd, 0, uid, 8)) {
+               PrintAndLog("UID must include 8 HEX symbols");
+               return 1;
+       }

        
        uint8_t iv[8] = { 0x00 };
        
        uint8_t iv[8] = { 0x00 };

-       uint8_t block = 0x07;
+       uint8_t block = 0x01;

        
        

-       // UL-EV1
-       //04 57 b6 e2 05 3f 80 UID
-       //4a f8 4b 19   PWD
-       uint8_t uid[] = { 0xF4,0xEA, 0x54, 0x8E };

        uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
        uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
        uint8_t dkeyA[8] = { 0x00 };
        uint8_t mifarekeyA[] = { 0xA0,0xA1,0xA2,0xA3,0xA4,0xA5 };
        uint8_t mifarekeyB[] = { 0xB0,0xB1,0xB2,0xB3,0xB4,0xB5 };
        uint8_t dkeyA[8] = { 0x00 };


@@ -1760,15 +1946,13 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
                , divkey         // output
                );
 
                , divkey         // output
                );
 

-       PrintAndLog("3DES version");
+       PrintAndLog("-- 3DES version");

        PrintAndLog("Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
        PrintAndLog("UID          :\t %s", sprint_hex(uid, sizeof(uid)));
        PrintAndLog("Masterkey    :\t %s", sprint_hex(masterkey,sizeof(masterkey)));
        PrintAndLog("UID          :\t %s", sprint_hex(uid, sizeof(uid)));

-       PrintAndLog("Sector       :\t %0d", block);
+       PrintAndLog("block        :\t %0d", block);

        PrintAndLog("Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
        PrintAndLog("Message      :\t %s", sprint_hex(mix, sizeof(mix)));
        PrintAndLog("Diversified key: %s", sprint_hex(divkey+1, 6));
        PrintAndLog("Mifare key   :\t %s", sprint_hex(mifarekeyA, sizeof(mifarekeyA)));
        PrintAndLog("Message      :\t %s", sprint_hex(mix, sizeof(mix)));
        PrintAndLog("Diversified key: %s", sprint_hex(divkey+1, 6));

-               
-       PrintAndLog("\n DES version");

        
        for (int i=0; i < sizeof(mifarekeyA); ++i){
                dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;
        
        for (int i=0; i < sizeof(mifarekeyA); ++i){
                dkeyA[i] = (mifarekeyA[i] << 1) & 0xff;


@@ -1798,120 +1982,27 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
                , newpwd         // output
                );
        
                , newpwd         // output
                );
        

+       PrintAndLog("\n-- DES version");

        PrintAndLog("Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
        PrintAndLog("Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
        PrintAndLog("Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
        PrintAndLog("Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
        
        PrintAndLog("Mifare dkeyA :\t %s", sprint_hex(dkeyA, sizeof(dkeyA)));
        PrintAndLog("Mifare dkeyB :\t %s", sprint_hex(dkeyB, sizeof(dkeyB)));
        PrintAndLog("Mifare ABA   :\t %s", sprint_hex(dmkey, sizeof(dmkey)));
        PrintAndLog("Mifare Pwd   :\t %s", sprint_hex(newpwd, sizeof(newpwd)));
        

+       // next. from the diversify_key method. 

        return 0;
 }
 
        return 0;
 }
 

-// static uint8_t * diversify_key(uint8_t * key){
-       
- // for(int i=0; i<16; i++){
-   // if(i<=6) key[i]^=cuid[i];
-   // if(i>6) key[i]^=cuid[i%7];
- // }
- // return key;
-// }
-
-// static void GenerateUIDe( uint8_t *uid, uint8_t len){
-       // for (int i=0; i<len; ++i){
-                       
-       // }
-       // return;
-// }
-
-int CmdHF14AMfuELoad(const char *Cmd)
-{
-       //FILE * f;
-       //char filename[FILE_PATH_SIZE];
-       //char *fnameptr = filename;
-       //char buf[64] = {0x00};
-       //uint8_t buf8[64] = {0x00};
-       //int i, len, blockNum, numBlocks;
-       //int nameParamNo = 1;
-       
+int CmdHF14AMfUeLoad(const char *Cmd) {

        char ctmp = param_getchar(Cmd, 0);
        char ctmp = param_getchar(Cmd, 0);

-               
-       if ( ctmp == 'h' || ctmp == 0x00) {
-               return usage_hf_mfu_eload();
-       }       
-/*
-       switch (ctmp) {
-               case '0' : numBlocks = 5*4; break;
-               case '1' : 
-               case '\0': numBlocks = 16*4; break;
-               case '2' : numBlocks = 32*4; break;
-               case '4' : numBlocks = 256; break;
-               default:  {
-                       numBlocks = 16*4;
-                       nameParamNo = 0;
-               }
-       }
-
-       len = param_getstr(Cmd,nameParamNo,filename);
-       
-       if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
-
-       fnameptr += len;
-
-       sprintf(fnameptr, ".eml"); 
-       
-       // open file
-       f = fopen(filename, "r");
-       if (f == NULL) {
-               PrintAndLog("File %s not found or locked", filename);
-               return 1;
-       }
-       
-       blockNum = 0;
-       while(!feof(f)){
-               memset(buf, 0, sizeof(buf));
-               
-               if (fgets(buf, sizeof(buf), f) == NULL) {
-                       
-                       if (blockNum >= numBlocks) break;
-                       
-                       PrintAndLog("File reading error.");
-                       fclose(f);
-                       return 2;
-               }
-               
-               if (strlen(buf) < 32){
-                       if(strlen(buf) && feof(f))
-                               break;
-                       PrintAndLog("File content error. Block data must include 32 HEX symbols");
-                       fclose(f);
-                       return 2;
-               }
-               
-               for (i = 0; i < 32; i += 2) {
-                       sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
-               }
-               
-               if (mfEmlSetMem(buf8, blockNum, 1)) {
-                       PrintAndLog("Cant set emul block: %3d", blockNum);
-                       fclose(f);
-                       return 3;
-               }
-               printf(".");
-               blockNum++;
-               
-               if (blockNum >= numBlocks) break;
-       }
-       fclose(f);
-       printf("\n");
-       
-       if ((blockNum != numBlocks)) {
-               PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);
-               return 4;
-       }
-       PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
-       */
-       return 0;
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) return usage_hf_mfu_eload();
+       return CmdHF14AMfELoad(Cmd);

 }
 
 }
 

+int CmdHF14AMfUSim(const char *Cmd) {
+       char ctmp = param_getchar(Cmd, 0);
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) return usage_hf_mfu_sim();
+       return CmdHF14ASim(Cmd);
+}

 
 //------------------------------------
 // Menu Stuff
 
 //------------------------------------
 // Menu Stuff


@@ -1922,18 +2013,20 @@ static command_t CommandTable[] =
        {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
        {"info",        CmdHF14AMfUInfo,        0, "Tag information"},
        {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
        {"dbg",         CmdHF14AMfDbg,          0, "Set default debug mode"},
        {"info",        CmdHF14AMfUInfo,        0, "Tag information"},
        {"dump",        CmdHF14AMfUDump,        0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},

+       {"eload",       CmdHF14AMfUeLoad,   0, "load Ultralight .eml dump file into emulator memory"},  

        {"rdbl",        CmdHF14AMfURdBl,        0, "Read block"},
        {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block"},
        {"rdbl",        CmdHF14AMfURdBl,        0, "Read block"},
        {"wrbl",        CmdHF14AMfUWrBl,        0, "Write block"},

-       {"eload",       CmdHF14AMfuELoad,       0, "<not implemented> Load from file emulator dump"},

        {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},
        {"cauth",       CmdHF14AMfucAuth,       0, "Authentication    - Ultralight C"},

-       {"setpwd",      CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"},
-       {"setuid",      CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"},
+       {"setpwd",      CmdHF14AMfucSetPwd, 0, "Set 3des password - Ultralight-C"},
+       {"setuid",      CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
+       {"sim",         CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},             

        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){
        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){

-       WaitForResponseTimeout(CMD_ACK,NULL,100);
+       clearCommandBuffer();
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);

        CmdsParse(CommandTable, Cmd);
        return 0;
 }
        CmdsParse(CommandTable, Cmd);
        return 0;
 }