X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5490c2d6d2cc8a032acdac5d7aba575765607a5f..refs/pull/208/head:/client/cmdlft55xx.c?ds=sidebyside
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 97061c56..9e4883c7 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
-#include <time.h>
#include "proxmark3.h"
#include "ui.h"
#include "graph.h"
@@ -22,14 +21,12 @@
#include "util.h"
#include "data.h"
#include "lfdemod.h"
-#include "../common/crc.h"
-#include "../common/iso14443crc.h"
-#include "cmdhf14a.h"
+#include "cmdhf14a.h" //for getTagInfo
#define T55x7_CONFIGURATION_BLOCK 0x00
#define T55x7_PAGE0 0x00
#define T55x7_PAGE1 0x01
-#define T55x7_PWD 0x00000010
+//#define T55x7_PWD 0x00000010
#define REGULAR_READ_MODE_BLOCK 0xFF
// Default configuration
@@ -51,6 +48,7 @@ int usage_t55xx_config(){
PrintAndLog(" i [1] Invert data signal, defaults to normal");
PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");
PrintAndLog(" Q5 Set as Q5(T5555) chip instead of T55x7");
+ PrintAndLog(" ST Set Sequence Terminator on");
PrintAndLog("");
PrintAndLog("Examples:");
PrintAndLog(" lf t55xx config d FSK - FSK demodulation");
@@ -78,7 +76,7 @@ int usage_t55xx_read(){
return 0;
}
int usage_t55xx_write(){
- PrintAndLog("Usage: lf t55xx wr [b <block>] [d <data>] [p <password>] [1]");
+ PrintAndLog("Usage: lf t55xx write [b <block>] [d <data>] [p <password>] [1]");
PrintAndLog("Options:");
PrintAndLog(" b <block> - block number to write. Between 0-7");
PrintAndLog(" d <data> - 4 bytes of data to write (8 hex characters)");
@@ -86,8 +84,8 @@ int usage_t55xx_write(){
PrintAndLog(" 1 - OPTIONAL write Page 1 instead of Page 0");
PrintAndLog("");
PrintAndLog("Examples:");
- PrintAndLog(" lf t55xx wr b 3 d 11223344 - write 11223344 to block 3");
- PrintAndLog(" lf t55xx wr b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
+ PrintAndLog(" lf t55xx write b 3 d 11223344 - write 11223344 to block 3");
+ PrintAndLog(" lf t55xx write b 3 d 11223344 p feedbeef - write 11223344 to block 3 password feedbeef");
PrintAndLog("");
return 0;
}
@@ -273,6 +271,11 @@ int CmdT55xxSetConfig(const char *Cmd) {
config.Q5 = TRUE;
cmdp++;
break;
+ case 'S':
+ case 's':
+ config.ST = TRUE;
+ cmdp++;
+ break;
default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = TRUE;
@@ -373,6 +376,7 @@ bool DecodeT55xxBlock(){
char buf[30] = {0x00};
char *cmdStr = buf;
int ans = 0;
+ bool ST = config.ST;
uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
DemodBufferLen = 0x00;
@@ -393,7 +397,7 @@ bool DecodeT55xxBlock(){
break;
case DEMOD_ASK:
snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
- ans = ASKDemod(cmdStr, FALSE, FALSE, 1);
+ ans = ASKDemod_ext(cmdStr, FALSE, FALSE, 1, &ST);
break;
case DEMOD_PSK1:
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
@@ -485,7 +489,6 @@ bool tryDetectModulation(){
t55xx_conf_block_t tests[15];
int bitRate=0;
uint8_t fc1 = 0, fc2 = 0, clk=0;
-
if (GetFskClock("", FALSE, FALSE)){
fskClocks(&fc1, &fc2, &clk, FALSE);
if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@@ -497,6 +500,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@@ -508,19 +512,22 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} else {
clk = GetAskClock("", FALSE, FALSE);
if (clk>0) {
- if ( ASKDemod("0 0 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+ tests[hits].ST = TRUE;
+ if ( ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
tests[hits].modulation = DEMOD_ASK;
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( ASKDemod("0 1 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
+ tests[hits].ST = TRUE;
+ if ( ASKDemod_ext("0 1 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
tests[hits].modulation = DEMOD_ASK;
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
@@ -532,6 +539,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {
@@ -539,6 +547,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
}
@@ -551,6 +560,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
@@ -559,6 +569,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
}
@@ -574,6 +585,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@@ -581,6 +593,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
// PSK2 - needs a call to psk1TOpsk2.
@@ -591,6 +604,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} // inverse waves does not affect this demod
@@ -602,6 +616,7 @@ bool tryDetectModulation(){
tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ tests[hits].ST = FALSE;
++hits;
}
} // inverse waves does not affect this demod
@@ -616,6 +631,7 @@ bool tryDetectModulation(){
config.offset = tests[0].offset;
config.block0 = tests[0].block0;
config.Q5 = tests[0].Q5;
+ config.ST = tests[0].ST;
printConfiguration( config );
return TRUE;
}
@@ -768,14 +784,14 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode
uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1;
//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //could check psk cr
- uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode
- uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;
+ //uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode
+ //uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;
//if extended mode
bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;
if (!extMode){
- if (nml01 || nml02 || xtRate) continue;
+ if (xtRate) continue; //nml01 || nml02 || caused issues on noralys tags
}
//test modulation
if (!testModulation(mode, modread)) continue;
@@ -839,6 +855,7 @@ int printConfiguration( t55xx_conf_block_t b){
PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );
PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );
PrintAndLog("Offset : %d", b.offset);
+ PrintAndLog("Seq. Term. : %s", (b.ST) ? "Yes" : "No" );
PrintAndLog("Block0 : 0x%08X", b.block0);
PrintAndLog("");
return 0;
@@ -1371,11 +1388,9 @@ int CmdT55xxBruteForce(const char *Cmd) {
char buf[9];
char filename[FILE_PATH_SIZE]={0};
int keycnt = 0;
+ int ch;
uint8_t stKeyBlock = 20;
- uint8_t *keyBlock = NULL, *p;
- keyBlock = calloc(stKeyBlock, 6);
- if (keyBlock == NULL) return 1;
-
+ uint8_t *keyBlock = NULL, *p = NULL;
uint32_t start_password = 0x00000000; //start password
uint32_t end_password = 0xFFFFFFFF; //end password
bool found = false;
@@ -1383,6 +1398,9 @@ int CmdT55xxBruteForce(const char *Cmd) {
char cmdp = param_getchar(Cmd, 0);
if (cmdp == 'h' || cmdp == 'H') return usage_t55xx_bruteforce();
+ keyBlock = calloc(stKeyBlock, 6);
+ if (keyBlock == NULL) return 1;
+
if (cmdp == 'i' || cmdp == 'I') {
int len = strlen(Cmd+2);
@@ -1417,6 +1435,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
if (!p) {
PrintAndLog("Cannot allocate memory for defaultKeys");
free(keyBlock);
+ fclose(f);
return 2;
}
keyBlock = p;
@@ -1431,6 +1450,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
if (keycnt == 0) {
PrintAndLog("No keys found in file");
+ free(keyBlock);
return 1;
}
PrintAndLog("Loaded %d keys", keycnt);
@@ -1440,8 +1460,10 @@ int CmdT55xxBruteForce(const char *Cmd) {
for (uint16_t c = 0; c < keycnt; ++c ) {
if (ukbhit()) {
- getchar();
+ ch = getchar();
+ (void)ch;
printf("\naborted via keyboard!\n");
+ free(keyBlock);
return 0;
}
@@ -1451,6 +1473,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {
PrintAndLog("Aquireing data from device failed. Quitting");
+ free(keyBlock);
return 0;
}
@@ -1458,10 +1481,12 @@ int CmdT55xxBruteForce(const char *Cmd) {
if ( found ) {
PrintAndLog("Found valid password: [%08X]", testpwd);
+ free(keyBlock);
return 0;
}
}
PrintAndLog("Password NOT found.");
+ free(keyBlock);
return 0;
}
@@ -1471,8 +1496,10 @@ int CmdT55xxBruteForce(const char *Cmd) {
start_password = param_get32ex(Cmd, 0, 0, 16);
end_password = param_get32ex(Cmd, 1, 0, 16);
- if ( start_password >= end_password ) return usage_t55xx_bruteforce();
-
+ if ( start_password >= end_password ) {
+ free(keyBlock);
+ return usage_t55xx_bruteforce();
+ }
PrintAndLog("Search password range [%08X -> %08X]", start_password, end_password);
uint32_t i = start_password;
@@ -1482,13 +1509,16 @@ int CmdT55xxBruteForce(const char *Cmd) {
printf(".");
fflush(stdout);
if (ukbhit()) {
- getchar();
+ ch = getchar();
+ (void)ch;
printf("\naborted via keyboard!\n");
+ free(keyBlock);
return 0;
}
if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {
PrintAndLog("Aquireing data from device failed. Quitting");
+ free(keyBlock);
return 0;
}
found = tryDetectModulation();
@@ -1503,6 +1533,8 @@ int CmdT55xxBruteForce(const char *Cmd) {
PrintAndLog("Found valid password: [%08x]", i);
else
PrintAndLog("Password NOT found. Last tried: [%08x]", --i);
+
+ free(keyBlock);
return 0;
}