X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/341fd1debcf5d0fa800020add543ea1493c802d6..ff3e07447893b004c6de5c7202c9b50f2c81ab04:/client/cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index a34b00d4..fbe4d2e6 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -66,22 +66,21 @@ int CmdSri512Read(const char *Cmd)
  * SRIX4K tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory/
  */
-int CmdSrix4kRead(const char *Cmd)
-{
+int CmdSrix4kRead(const char *Cmd) {
 	UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
 
-
 int rawClose(void){
 	UsbCommand resp;
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
 	if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-	return 0;	
+		PrintAndLog("Command time-out");
+		return 1;
 	}
 	return 0;
 }
@@ -689,11 +688,6 @@ uint32_t srix4kEncode(uint32_t value) {
 //                vv vv vv pp 
 4 bytes			: 00 1A 20 01
 */
-
-#define NibbleHigh(b) ( (b & 0xF0) >> 4 )
-#define NibbleLow(b)  ( b & 0x0F )
-#define Crumb(b,p)    (((b & (0x3 << p) ) >> p ) & 0xF) 
-
 	// only the lower crumbs.
 	uint8_t block = (value & 0xFF);
 	uint8_t i = 0;
@@ -704,18 +698,18 @@ uint32_t srix4kEncode(uint32_t value) {
 	// Scrambled part
 	// Crumb swapping of value.
 	uint8_t temp[] = {0,0};
-	temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4;
-	temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4);
-	temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4;
-	temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8  ) << 2 | Crumb(value, 0);
+	temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4;
+	temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4);
+	temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4;
+	temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8  ) << 2 | CRUMB(value, 0);
 
 	// chksum part
 	uint32_t chksum = 0xFF - block;
 	
 	// chksum is reduced by each nibbles of value.
 	for (i = 0; i < 3; ++i){
-		chksum -= NibbleHigh(valuebytes[i]);
-		chksum -= NibbleLow(valuebytes[i]);
+		chksum -= NIBBLE_HIGH(valuebytes[i]);
+		chksum -= NIBBLE_LOW(valuebytes[i]);
 	}
 
 	// base4 conversion and left shift twice
@@ -728,17 +722,17 @@ uint32_t srix4kEncode(uint32_t value) {
 	
 	// merge scambled and chksum parts
 	uint32_t encvalue = 
-		( NibbleLow ( base4[0]) << 28 ) |
-		( NibbleHigh( temp[0])  << 24 ) |
+		( NIBBLE_LOW ( base4[0]) << 28 ) |
+		( NIBBLE_HIGH( temp[0])  << 24 ) |
 		
-		( NibbleLow ( base4[1]) << 20 ) |
-		( NibbleLow ( temp[0])  << 16 ) |
+		( NIBBLE_LOW ( base4[1]) << 20 ) |
+		( NIBBLE_LOW ( temp[0])  << 16 ) |
 		
-		( NibbleLow ( base4[2]) << 12 ) |
-		( NibbleHigh( temp[1])  << 8 ) |
+		( NIBBLE_LOW ( base4[2]) << 12 ) |
+		( NIBBLE_HIGH( temp[1])  << 8 ) |
 		
-		( NibbleLow ( base4[3]) << 4 ) |
-		  NibbleLow ( temp[1] );
+		( NIBBLE_LOW ( base4[3]) << 4 ) |
+		  NIBBLE_LOW ( temp[1] );
 
 	PrintAndLog("ICE encoded | %08X -> %08X", value, encvalue);
 	return encvalue;
@@ -804,47 +798,25 @@ int CmdteaSelfTest(const char *Cmd){
 	
 	SwapEndian64ex(v , 8, 4, v_ptr);
 	
-
+	// ENCRYPTION KEY:	
+	uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB };
+	uint8_t keyle[16];
+	uint8_t* key_ptr = keyle;
+	SwapEndian64ex(key , sizeof(key), 4, key_ptr);
 	
-	PrintAndLog("Modified Burtle");
-	prng_ctx ctx; // = { 0, 0, 0, 0 };
-	uint32_t num = bytes_to_num(v+1, 4);
-	burtle_init_mod( &ctx, num);
-	PrintAndLog("V   : %X", num);
-	PrintAndLog("BURT: %X", burtle_get_mod( &ctx));
-	PrintAndLog("SIMP: %X", GetSimplePrng(num));
-
-	uint8_t calc[16];
+	PrintAndLog("TEST LE enc| %s", sprint_hex(v_ptr, 8));
 	
-	for ( uint8_t i=0; i<8; ++i){
-		if ( i%2 == 0) {
-			calc[0] += v[i];
-			calc[1] += NibbleHigh( v[i]);
-			calc[2] += NibbleLow( v[i]);			
-			calc[3] ^= v[i];
-			calc[4] ^= NibbleHigh(v[i]);
-			calc[5] ^= NibbleLow( v[i]);
-		}			
-		else {
-			calc[6] += v[i];
-			calc[7] += NibbleHigh( v[i]);
-			calc[8] += NibbleLow( v[i]);			
-			calc[9] ^= v[i];
-			calc[10] ^= NibbleHigh(v[i]);
-			calc[11] ^= NibbleLow( v[i]);
-		}		
-	}
-	for ( uint8_t i=0; i<4; ++i) calc[12] += v[i];
-	for ( uint8_t i=1; i<5; ++i) calc[13] += v[i];
-	for ( uint8_t i=2; i<6; ++i) calc[14] += v[i];
-	for ( uint8_t i=3; i<7; ++i) calc[15] += v[i];
+	tea_decrypt(v_ptr, key_ptr);	
+	PrintAndLog("TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
+	
+	tea_encrypt(v_ptr, key_ptr);	
+	tea_encrypt(v_ptr, key_ptr);
+	PrintAndLog("TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
 
-	PrintAndLog("%s ", sprint_hex(calc, 16) );
 	return 0;
 }
 
-static command_t CommandTable[] = 
-{
+static command_t CommandTable[] = {
 	{"help",        CmdHelp,        1, "This help"},
 	{"info",        CmdHF14Binfo,   0, "Find and print details about a 14443B tag"},
 	{"list",        CmdHF14BList,   0, "[Deprecated] List ISO 14443B history"},
@@ -860,14 +832,13 @@ static command_t CommandTable[] =
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdHF14B(const char *Cmd)
-{
+int CmdHF14B(const char *Cmd) {
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
 	CmdsHelp(CommandTable);
 	return 0;
 }