X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dd8e45133090d9684a7f0d37ef59137e6b7159a9..refs/pull/884/head:/client/cmdlft55xx.c?ds=sidebyside
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 25df4c76..c64e5ef2 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -67,8 +67,8 @@ int usage_t55xx_read(){
PrintAndLog(" p <password> - OPTIONAL password (8 hex characters)");
PrintAndLog(" o - OPTIONAL override safety check");
PrintAndLog(" 1 - OPTIONAL read Page 1 instead of Page 0");
- PrintAndLog(" e <mode> - OPTIONAL downlink encoding '0' fixed-bit-length (default), '1' Long Zero Reference");
- PrintAndLog(" '2' Leading Zero, '3' 1 of 4 ");
+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");
+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference");
PrintAndLog(" ****WARNING****");
PrintAndLog(" Use of read with password on a tag not configured for a pwd");
PrintAndLog(" can damage the tag");
@@ -88,8 +88,8 @@ int usage_t55xx_write(){
PrintAndLog(" p <password> - OPTIONAL password 4bytes (8 hex characters)");
PrintAndLog(" 1 - OPTIONAL write Page 1 instead of Page 0");
PrintAndLog(" t - OPTIONAL test mode write - ****DANGER****");
- PrintAndLog(" e <mode> - OPTIONAL downlink encoding '0' fixed-bit-length (default), '1' Long Zero Reference");
- PrintAndLog(" '2' Leading Zero, '3' 1 of 4 ");
+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");
+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");
@@ -136,8 +136,8 @@ int usage_t55xx_detect(){
PrintAndLog("Options:");
PrintAndLog(" 1 - if set, use Graphbuffer otherwise read data from tag.");
PrintAndLog(" p <password> - OPTIONAL password (8 hex characters)");
- PrintAndLog(" e <mode> - OPTIONAL downlink encoding '0' fixed-bit-length (default), '1' Long Zero Reference");
- PrintAndLog(" '2' Leading Zero, '3' 1 of 4 ");
+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default), '1' long leading reference");
+ PrintAndLog(" '2' leading zero, '3' 1 of 4 coding reference");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx detect");
@@ -168,7 +168,7 @@ int usage_t55xx_wakup(){
PrintAndLog(" <password> - [required] password 4bytes (8 hex symbols)");
PrintAndLog("");
PrintAndLog("Examples:");
- PrintAndLog(" lf t55xx wakeup 11223344 - send wakeup password");
+ PrintAndLog(" lf t55xx wakeup 11223344 - send wakeup password");
return 0;
}
int usage_t55xx_bruteforce(){
@@ -178,31 +178,16 @@ int usage_t55xx_bruteforce(){
PrintAndLog(" password must be 4 bytes (8 hex symbols)");
PrintAndLog("Options:");
PrintAndLog(" h - this help");
+ PrintAndLog(" r <mode> - OPTIONAL downlink encoding '0' fixed bit length (default)");
+ PrintAndLog(" '1' long leading reference, '2' leading zero ");
+ PrintAndLog(" '3' 1 of 4 coding reference, '4' special - try all downlink modes");
PrintAndLog(" <start_pwd> - 4 byte hex value to start pwd search at");
PrintAndLog(" <end_pwd> - 4 byte hex value to end pwd search at");
PrintAndLog(" i <*.dic> - loads a default keys dictionary file <*.dic>");
PrintAndLog("");
PrintAndLog("Examples:");
- PrintAndLog(" lf t55xx bruteforce aaaaaaaa bbbbbbbb");
- PrintAndLog(" lf t55xx bruteforce i default_pwd.dic");
- PrintAndLog("");
- return 0;
-}
-int usage_t55xx_bruteforce_downlink(){
- PrintAndLog("This command uses A) bruteforce to scan a number range");
- PrintAndLog(" B) a dictionary attack");
- PrintAndLog("Usage: lf t55xx bruteforce <start password> <end password> [i <*.dic>]");
- PrintAndLog(" password must be 4 bytes (8 hex symbols)");
- PrintAndLog("Options:");
- PrintAndLog(" h - this help");
- PrintAndLog(" r <start_pwd> <end_pwd> - 4 byte hex value to start and end pwd search at");
- PrintAndLog(" i <*.dic> - loads a default keys dictionary file <*.dic>");
- PrintAndLog(" e <mode> - OPTIONAL downlink encoding '0' fixed-bit-length (default), '1' Long Zero Reference");
- PrintAndLog(" '2' Leading Zero, '3' 1 of 4 ");
- PrintAndLog("");
- PrintAndLog("Examples:");
- PrintAndLog(" lf t55xx bruteforce aaaaaaaa bbbbbbbb");
- PrintAndLog(" lf t55xx bruteforce i default_pwd.dic");
+ PrintAndLog(" lf t55xx bruteforce [r 2] aaaaaaaa bbbbbbbb");
+ PrintAndLog(" lf t55xx bruteforce [r 2] i default_pwd.dic");
PrintAndLog("");
return 0;
}
@@ -326,13 +311,13 @@ int CmdT55xxSetConfig(const char *Cmd) {
}
// No args
- if (cmdp == 0) return printConfiguration( config );
+ if (cmdp == 0) return printConfiguration( config);
//Validations
if (errors) return usage_t55xx_config();
config.block0 = 0;
- return printConfiguration ( config );
+ return printConfiguration ( config);
}
int T55xxReadBlock(uint8_t block, bool page1, bool usepwd, bool override, uint32_t password, uint8_t downlink_mode){
@@ -398,8 +383,8 @@ int CmdT55xxReadBlock(const char *Cmd) {
page1 = true;
cmdp++;
break;
- case 'e':
- case 'E':
+ case 'r':
+ case 'R':
downlink_mode = param_getchar(Cmd, cmdp+1) - '0';
if (downlink_mode > 3) downlink_mode = 0;
cmdp +=2;
@@ -491,6 +476,25 @@ bool DecodeT5555TraceBlock() {
return (bool) ASKDemod("64 0 1", false, false, 1);
}
+void T55xx_Print_DownlinkMode (uint8_t downlink_mode)
+{
+ char Msg[80];
+ sprintf (Msg,"Downlink Mode used : ");
+
+ switch (downlink_mode) {
+ case 0 : strcat (Msg,"default/fixed bit length"); break;
+ case 1 : strcat (Msg,"long leading reference (r 1)"); break;
+ case 2 : strcat (Msg,"leading zero reference (r 2)"); break;
+ case 3 : strcat (Msg,"1 of 4 coding reference (r 3)"); break;
+ default :
+ strcat (Msg,"default/fixed bit length"); break;
+
+ }
+
+ PrintAndLog (Msg);
+
+}
+
int CmdT55xxDetect(const char *Cmd){
bool errors = false;
bool useGB = false;
@@ -515,8 +519,8 @@ int CmdT55xxDetect(const char *Cmd){
useGB = true;
cmdp++;
break;
- case 'e':
- case 'E':
+ case 'r':
+ case 'R':
downlink_mode = param_getchar(Cmd, cmdp+1) - '0';
if (downlink_mode > 3) downlink_mode = 0;
cmdp +=2;
@@ -537,16 +541,8 @@ int CmdT55xxDetect(const char *Cmd){
if ( !tryDetectModulation() )
PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
else {
- // Add downlink mode to reference.
- switch (downlink_mode) {
- case 0 : PrintAndLog ("Downlink : e 0 - Default/Fixed Bit Length"); break;
- case 1 : PrintAndLog ("Downlink : e 1 - Long Leading Reference"); break;
- case 2 : PrintAndLog ("Downlink : e 2 - Leading Zero Reference"); break;
- case 3 : PrintAndLog ("Downlink : e 3 - 1 of 4 Coding"); break;
- // default:
-
- // No default action
- }
+ // Add downlink mode for reference.
+ T55xx_Print_DownlinkMode (downlink_mode);
}
return 1;
}
@@ -699,7 +695,8 @@ bool tryDetectModulation(){
config.block0 = tests[0].block0;
config.Q5 = tests[0].Q5;
config.ST = tests[0].ST;
- printConfiguration( config );
+
+ printConfiguration( config);
return true;
}
@@ -707,7 +704,7 @@ bool tryDetectModulation(){
PrintAndLog("Found [%d] possible matches for modulation.",hits);
for(int i=0; i<hits; ++i){
PrintAndLog("--[%d]---------------", i+1);
- printConfiguration( tests[i] );
+ printConfiguration( tests[i]);
}
}
return false;
@@ -987,8 +984,8 @@ int CmdT55xxWriteBlock(const char *Cmd) {
page1 = true;
cmdp++;
break;
- case 'e':
- case 'E':
+ case 'r':
+ case 'R':
downlink_mode = param_getchar(Cmd, cmdp+1) - '0';
if (downlink_mode > 3) downlink_mode = 0;
cmdp +=2;
@@ -1458,16 +1455,29 @@ int CmdT55xxBruteForce(const char *Cmd) {
char buf[9];
char filename[FILE_PATH_SIZE]={0};
int keycnt = 0;
- uint8_t downlink_mode = 0;
int ch;
uint8_t stKeyBlock = 20;
uint8_t *keyBlock = NULL, *p = NULL;
uint32_t start_password = 0x00000000; //start password
uint32_t end_password = 0xFFFFFFFF; //end password
bool found = false;
-
+ uint8_t downlink_mode = 0;
+ bool try_all_dl_modes = false;
+ uint8_t dl_mode = 0;
+ uint8_t cmd_offset = 0;
+ int cmd_opt = 0;
+
char cmdp = param_getchar(Cmd, 0);
+
if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();
+ if (cmdp == 'r' || cmdp == 'R') {
+ downlink_mode = param_getchar(Cmd, 1) - '0'; // get 2nd option, as this is fixed order.
+ if (downlink_mode == 4) try_all_dl_modes = true;
+ if (downlink_mode > 3) downlink_mode = 0;
+ cmd_opt += 2; // To help start/end passwords for range to be found
+ cmd_offset += 4; // r <sp> x <sp> To help the string offset for filename start position in cmd
+ cmdp = param_getchar(Cmd, 2); // get 3rd option, as this is fixed order.
+ }
keyBlock = calloc(stKeyBlock, 6);
if (keyBlock == NULL) return 1;
@@ -1476,7 +1486,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
int len = strlen(Cmd+2);
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
- memcpy(filename, Cmd+2, len);
+ memcpy(filename, Cmd+2+cmd_offset, len);
FILE * f = fopen( filename , "r");
@@ -1541,20 +1551,29 @@ int CmdT55xxBruteForce(const char *Cmd) {
testpwd = bytes_to_num(keyBlock + 4*c, 4);
PrintAndLog("Testing %08X", testpwd);
+
+ // Try each downlink_mode if asked to
+ // donwlink_mode will = 0 if > 3 or set to 0, so loop from 0 - 3
+ for (dl_mode = downlink_mode; dl_mode <= 3; dl_mode++){
+ if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd, dl_mode)) {
+ PrintAndLog("Acquiring data from device failed. Quitting");
+ free(keyBlock);
+ return 0;
+ }
- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd,downlink_mode)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
- free(keyBlock);
- return 0;
- }
+ found = tryDetectModulation();
- found = tryDetectModulation();
+ if ( found ) {
+ PrintAndLog("Found valid password: [%08X]", testpwd);
+ free(keyBlock);
+
+ T55xx_Print_DownlinkMode (dl_mode);
- if ( found ) {
- PrintAndLog("Found valid password: [%08X]", testpwd);
- free(keyBlock);
- return 0;
- }
+ return 0;
+ }
+ if (!try_all_dl_modes) // Exit loop if not trying all downlink modes
+ dl_mode = 4;
+ }
}
PrintAndLog("Password NOT found.");
free(keyBlock);
@@ -1564,8 +1583,8 @@ int CmdT55xxBruteForce(const char *Cmd) {
// Try to read Block 7, first :)
// incremental pwd range search
- start_password = param_get32ex(Cmd, 0, 0, 16);
- end_password = param_get32ex(Cmd, 1, 0, 16);
+ start_password = param_get32ex(Cmd, cmd_opt , 0, 16);
+ end_password = param_get32ex(Cmd, cmd_opt+1 , 0, 16);
if ( start_password >= end_password ) {
free(keyBlock);
@@ -1586,262 +1605,36 @@ int CmdT55xxBruteForce(const char *Cmd) {
free(keyBlock);
return 0;
}
-
- if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i,downlink_mode)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
- free(keyBlock);
- return 0;
- }
- found = tryDetectModulation();
-
- if (found) break;
- i++;
- }
-
- PrintAndLog("");
-
- if (found)
- PrintAndLog("Found valid password: [%08x]", i);
- else
- PrintAndLog("Password NOT found. Last tried: [%08x]", --i);
-
- free(keyBlock);
- return 0;
-}
-
-int CmdT55xxBruteForce_downlink(const char *Cmd) {
-
- // load a default pwd file.
- char buf[9];
- char filename[FILE_PATH_SIZE]={0};
- int keycnt = 0;
- uint8_t downlink_mode = 0;
- int ch;
- uint8_t stKeyBlock = 20;
- uint8_t *keyBlock = NULL, *p = NULL;
- uint32_t start_password = 0x00000000; //start password
- uint32_t end_password = 0xFFFFFFFF; //end password
- bool found = false;
- uint8_t cmdp = 0;
- int cmd_offset = 0;
- int errors = 0;
- int len;
- bool use_file = false;
- bool use_range = false;
- bool try_all_dl_modes = false;
- uint8_t dl_mode = 0;
-
- keyBlock = calloc(stKeyBlock, 6);
- if (keyBlock == NULL) return 1;
-
- PrintAndLog("New Downlink Supprt");
-
- while(param_getchar(Cmd, cmdp) != 0x00 && !errors) {
- switch(param_getchar(Cmd, cmdp)) {
- case 'h':
- case 'H':
- return usage_t55xx_bruteforce_downlink();
- case 'e':
- case 'E':
- downlink_mode = param_getchar(Cmd, cmdp+1) - '0';
- if (downlink_mode == 4) try_all_dl_modes = true;
- if (downlink_mode > 3) downlink_mode = 0;
- cmdp +=2;
- cmd_offset += 4;
- PrintAndLog ("DL Mode : %d",downlink_mode);
- break;
- case 'i':
- case 'I':
- if (use_range) {
- PrintAndLog ("use Range or File");
- return 0;
- }
- use_file = true;
- len = strlen(Cmd+2);
- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
- memcpy(filename, Cmd+cmd_offset+2, len);
- cmdp += 2;
- // PrintAndLog (" File : [%s]",filename);
- break;
- case 'r':
- case 'R':
- if (use_file) {
- PrintAndLog ("use Range or File");
- return 0;
- }
- use_range = true; // = param_get32ex(Cmd, cmdp+1, 0, 16);
- start_password = param_get32ex(Cmd, cmdp+1, 0, 16);
- end_password = param_get32ex(Cmd, cmdp+2, 0, 16);
- cmdp += 3;
- cmd_offset += 20; // 8 + 8 + 1 + 1 + 1
- // PrintAndLog (" Range : [%0X] - [%0X]",start_password,end_password);
- break;
- default:
- PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
- errors = true;
- break;
- }
- }
-
-
-// if (cmdp == 'i' || cmdp == 'I') {
-
- if (use_file)
- {
- FILE * f = fopen( filename , "r");
-
- if ( !f ) {
- PrintAndLog("File: %s: not found or locked.", filename);
- free(keyBlock);
- return 1;
- }
-
- while( fgets(buf, sizeof(buf), f) ) {
- if (strlen(buf) < 8 || buf[7] == '\n') continue;
-
- while (fgetc(f) != '\n' && !feof(f)) ; //goto next line
-
- //The line start with # is comment, skip
- if( buf[0]=='#' ) continue;
-
- if (!isxdigit((unsigned char)buf[0])) {
- PrintAndLog("File content error. '%s' must include 8 HEX symbols", buf);
- continue;
- }
-
- buf[8] = 0;
-
- if ( stKeyBlock - keycnt < 2) {
- p = realloc(keyBlock, 6*(stKeyBlock+=10));
- if (!p) {
- PrintAndLog("Cannot allocate memory for defaultKeys");
- free(keyBlock);
- fclose(f);
- return 2;
- }
- keyBlock = p;
- }
- memset(keyBlock + 4 * keycnt, 0, 4);
- num_to_bytes(strtoll(buf, NULL, 16), 4, keyBlock + 4*keycnt);
- PrintAndLog("chk custom pwd[%2d] %08X", keycnt, bytes_to_num(keyBlock + 4*keycnt, 4));
- keycnt++;
- memset(buf, 0, sizeof(buf));
- }
- fclose(f);
-
- if (keycnt == 0) {
- PrintAndLog("No keys found in file");
- free(keyBlock);
- return 1;
- }
- PrintAndLog("Loaded %d keys", keycnt);
-
- // loop
- uint64_t testpwd = 0x00;
- for (uint16_t c = 0; c < keycnt; ++c ) {
-
- if (ukbhit()) {
- ch = getchar();
- (void)ch;
- printf("\naborted via keyboard!\n");
- free(keyBlock);
- return 0;
- }
-
- testpwd = bytes_to_num(keyBlock + 4*c, 4);
-
- PrintAndLog("Testing %08X", testpwd);
-
- // Try each downlink_mode of asked to
- // donwlink_mode will = 0 if > 3 or set to 0, so loop from 0 - 3
- for (dl_mode = downlink_mode; dl_mode <= 3; dl_mode++)
- {
- if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd,dl_mode)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
- free(keyBlock);
- return 0;
- }
-
- found = tryDetectModulation();
-
- if ( found ) {
- PrintAndLog("Found valid password: [%08X]", testpwd);
- free(keyBlock);
- // Add downlink mode to reference.
- switch (dl_mode) {
- case 0 : PrintAndLog ("Downlink : e 0 - Default/Fixed Bit Length"); break;
- case 1 : PrintAndLog ("Downlink : e 1 - Long Leading Reference"); break;
- case 2 : PrintAndLog ("Downlink : e 2 - Leading Zero Reference"); break;
- case 3 : PrintAndLog ("Downlink : e 3 - 1 of 4 Coding"); break;
- }
- return 0;
- }
- if (!try_all_dl_modes) // Exit loop
- dl_mode = 4;
- }
- }
- PrintAndLog("Password NOT found.");
- free(keyBlock);
- return 0;
- }
-
- if (use_range)
- {
- // incremental pwd range search
- // start_password = param_get32ex(Cmd, 0, 0, 16);
- // end_password = param_get32ex(Cmd, 1, 0, 16);
-
- if ( start_password >= end_password ) {
- free(keyBlock);
- return usage_t55xx_bruteforce_downlink();
- }
- PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);
-
- uint32_t i = start_password;
-
- while ((!found) && (i <= end_password)) {
-
- printf(".");
- fflush(stdout);
- if (ukbhit()) {
- ch = getchar();
- (void)ch;
- printf("\naborted via keyboard!\n");
- free(keyBlock);
- return 0;
- }
-
- if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i,downlink_mode)) {
- PrintAndLog("Aquireing data from device failed. Quitting");
+ // Try each downlink_mode if asked to
+ // donwlink_mode will = 0 if > 3 or set to 0, so loop from 0 - 3
+ for (dl_mode = downlink_mode; dl_mode <= 3; dl_mode++){
+ if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i,dl_mode)) {
+ PrintAndLog("Acquiring data from device failed. Quitting");
free(keyBlock);
return 0;
}
found = tryDetectModulation();
if (found) break;
- i++;
+ if (!try_all_dl_modes) // Exit loop if not trying all downlink modes
+ dl_mode = 4;
}
+ if (found) break;
+ i++;
+ }
+ if (found){
+ PrintAndLog("Found valid password: [%08x]", i);
+ T55xx_Print_DownlinkMode (downlink_mode);
+ }
+ else{
PrintAndLog("");
-
- if (found) {
- PrintAndLog("Found valid password: [%08x]", i);
- // Add downlink mode to reference.
- switch (downlink_mode) {
- case 0 : PrintAndLog ("Downlink : e 0 - Default/Fixed Bit Length"); break;
- case 1 : PrintAndLog ("Downlink : e 1 - Long Leading Reference"); break;
- case 2 : PrintAndLog ("Downlink : e 2 - Leading Zero Reference"); break;
- case 3 : PrintAndLog ("Downlink : e 3 - 1 of 4 Coding"); break;
- }
- }
- else
- PrintAndLog("Password NOT found. Last tried: [%08x]", --i);
-
- free(keyBlock);
+ PrintAndLog("Password NOT found. Last tried: [%08x]", --i);
}
+
+ free(keyBlock);
return 0;
}
-
// note length of data returned is different for different chips.
// some return all page 1 (64 bits) and others return just that block (32 bits)
// unfortunately the 64 bits makes this more likely to get a false positive...
@@ -1993,7 +1786,6 @@ int CmdT55xxDetectPage1(const char *Cmd){
static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"},
{"bruteforce",CmdT55xxBruteForce,0, "<start password> <end password> [i <*.dic>] Simple bruteforce attack to find password"},
- {"bruteforcedl",CmdT55xxBruteForce_downlink,0, "r <start password> <end password> [i <*.dic>] [e <downlink>] Simple bruteforce attack to find password"},
{"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
{"detect", CmdT55xxDetect, 1, "[1] Try detecting the tag modulation from reading the configuration block."},
{"p1detect", CmdT55xxDetectPage1,1, "[1] Try detecting if this is a t55xx tag by reading page 1"},