X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/29ce214c65d0d36679b8496dd8dddf4ea2b0ec23..be818b141745aa0831dba63d2e5f9cd088614c98:/client/cmdlfjablotron.c

diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index da4b0040..bd99fede 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -6,6 +6,7 @@
 //-----------------------------------------------------------------------------
 // Low frequency Presco tag commands
 //-----------------------------------------------------------------------------
+
 #include "cmdlfjablotron.h"
 
 static int CmdHelp(const char *Cmd);
@@ -18,7 +19,7 @@ int usage_lf_jablotron_clone(void){
 	PrintAndLog("      <card ID>  : jablotron card ID");
 	PrintAndLog("      <Q5>       : specify write to Q5 (t5555 instead of t55x7)");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf jablotron clone d 112233");
+	PrintAndLog("Sample: lf jablotron clone 112233");
 	return 0;
 }
 
@@ -31,7 +32,7 @@ int usage_lf_jablotron_sim(void) {
 	PrintAndLog("      h          : This help");
 	PrintAndLog("      <card ID>  : jablotron card ID");
 	PrintAndLog("");
-	PrintAndLog("Sample: lf jablotron sim d 112233");
+	PrintAndLog("Sample: lf jablotron sim 112233");
 	return 0;
 }
 
@@ -57,6 +58,17 @@ int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
 	return 1;
 }
 
+static uint64_t getJablontronCardId( uint64_t rawcode ){
+	uint64_t id = 0;
+	uint8_t bytes[] = {0,0,0,0,0};
+	num_to_bytes(rawcode, 5, bytes);
+	for ( int i = 4, j = 0; i > -1;  --i, j += 2 ) {
+		id += NIBBLE_LOW( bytes[i] ) * (int)pow(10,j);
+		id += NIBBLE_HIGH( bytes[i] ) * (int)pow(10,j+1);
+	}
+	return id;
+}
+
 //see ASKDemod for what args are accepted
 int CmdJablotronDemod(const char *Cmd) {
 
@@ -93,11 +105,11 @@ int CmdJablotronDemod(const char *Cmd) {
 	//got a good demod
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
-	uint64_t cardid = (raw1 & 0xFFFF);
-	cardid <<= 24;
-	cardid |= (raw2 >> 8);
-	
-	PrintAndLog("Jablotron Tag Found: Card ID %"PRIx64, cardid);
+
+	uint64_t rawid = bytebits_to_byte(DemodBuffer+16, 40);
+	uint64_t id = getJablontronCardId(rawid);
+
+	PrintAndLog("Jablotron Tag Found: Card ID %u", id);
 	PrintAndLog("Raw: %08X%08X", raw1 ,raw2);
 
 	uint8_t chksum = raw2 & 0xFF;
@@ -105,13 +117,14 @@ int CmdJablotronDemod(const char *Cmd) {
 		chksum,
 		(chksum == jablontron_chksum(DemodBuffer)) ? "OK":"FAIL"		
 	);
-		
+
+	id = DEC2BCD(id);
 	// Printed format: 1410-nn-nnnn-nnnn	
-	PrintAndLog("Printed:  1410-%02X-%04X-%04X",
-		(raw1 & 0x0000FF00) >> 8,
-		(raw1 & 0xFF) << 8 | ((raw2 >> 24) & 0xFF),
-		(raw2 & 0x00FFFF00) >> 8
-	);	
+	PrintAndLog("Printed: 1410-%02X-%04X-%04X",
+		(uint8_t)(id >> 32) & 0xFF,
+		(uint16_t)(id >> 16) & 0xFFFF,
+		(uint16_t)id & 0xFFFF
+	);
 	return 1;
 }
 
@@ -144,7 +157,7 @@ int CmdJablotronClone(const char *Cmd) {
 	// clearing the topbit needed for the preambl detection. 
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLog("Card Number Truncated to 40-bits: %"PRIx64, fullcode);
+		PrintAndLog("Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
 	
 	if ( !getJablotronBits(fullcode, bs)) {
@@ -166,7 +179,7 @@ int CmdJablotronClone(const char *Cmd) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
-	for (int i=4; i>=0; i--) {
+	for (int i = 2; i >= 0; --i) {
 		c.arg[0] = blocks[i];
 		c.arg[1] = i;
 		clearCommandBuffer();
@@ -190,7 +203,7 @@ int CmdJablotronSim(const char *Cmd) {
 	// clearing the topbit needed for the preambl detection. 
 	if ((fullcode & 0x7FFFFFFFFF) != fullcode) {
 		fullcode &= 0x7FFFFFFFFF;
-		PrintAndLog("Card Number Truncated to 40-bits: %"PRIx64, fullcode);
+		PrintAndLog("Card Number Truncated to 39bits: %"PRIx64, fullcode);
 	}
 	
 	uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;