X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dccddaef7798ebebc7309e004a96f0e02f76dfb6..ad5bc8cc8c0a6573d6b2c7bc58bf94f7ab66ad4c:/client/cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index a328d039..471ac0f3 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -8,10 +8,6 @@
 // High frequency ISO14443B commands
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
 #include "cmdhf14b.h"
 
 #define TIMEOUT 2000
@@ -139,18 +135,15 @@ int CmdHF14BSnoop(const char *Cmd) {
 }
 
 int CmdHF14BCmdRaw (const char *Cmd) {
-	bool reply = TRUE;
-	bool power = FALSE;
-	bool select = FALSE;
-	char buf[5]="";
-
+	bool reply = TRUE, power = FALSE, select = FALSE;
+	char buf[5] = "";
 	int i = 0;
 	uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
 	uint16_t datalen = 0;
 	uint32_t flags = ISO14B_CONNECT;
 	uint32_t temp = 0;
 	
-	if (strlen(Cmd)<3) return usage_hf_14b_raw();
+	if ( strlen(Cmd) < 3 ) return usage_hf_14b_raw();
 
     // strip
     while (*Cmd==' ' || *Cmd=='\t') ++Cmd;
@@ -159,8 +152,8 @@ int CmdHF14BCmdRaw (const char *Cmd) {
         if (Cmd[i]==' ' || Cmd[i]=='\t') { ++i; continue; }
         if (Cmd[i]=='-') {
             switch (Cmd[i+1]) {
-				case 'H':
 				case 'h':
+				case 'H':
 					return usage_hf_14b_raw();
                 case 'r': 
                 case 'R': 
@@ -209,10 +202,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 		return 0;
     }
 	
-	if(!power)
+	if (!power)
         flags |= ISO14B_DISCONNECT;
 
-    if(datalen>0)
+    if (datalen>0)
         flags |= ISO14B_RAW;
 
 	// Max buffer is USB_CMD_DATA_SIZE
@@ -227,11 +220,11 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 
 	bool success = TRUE;
 	// get back iso14b_card_select_t, don't print it.
-	if(select) 
+	if (select) 
 		success = waitCmd(FALSE);
 
 	// get back response from the raw bytes you sent.
-	if(success && datalen>0) waitCmd(TRUE);
+	if (success && datalen>0) waitCmd(TRUE);
 
     return 1;
 }
@@ -256,7 +249,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
 	if (BitRate & 0x04)	PrintAndLog("      Bit Rate: 847 kbit/s PICC <- PCD supported"); 
 	if (BitRate & 0x80)	PrintAndLog("                Same bit rate <-> required");
 
-	uint16_t maxFrame = data[5]>>4;
+	uint16_t maxFrame = data[5] >> 4;
 	if (maxFrame < 5) 		maxFrame = 8 * maxFrame + 16;
 	else if (maxFrame == 5)	maxFrame = 64;
 	else if (maxFrame == 6)	maxFrame = 96;
@@ -264,7 +257,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
 	else if (maxFrame == 8)	maxFrame = 256;
 	else maxFrame = 257;
 	
-	PrintAndLog("Max Frame Size: %u%s bytes",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+	PrintAndLog("Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
 
 	uint8_t protocolT = data[5] & 0xF;
 	PrintAndLog(" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
@@ -704,7 +697,7 @@ int CmdHF14BWriteSri(const char *Cmd){
 		);
 	}
 	
-	sprintf(str, "-ss -c %02x %02x %02x%02x%02x%02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
+	sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
 	CmdHF14BCmdRaw(str);
 	return 0;
 }
@@ -809,41 +802,6 @@ int srix4kValid(const char *Cmd){
 	return 0;
 }
 
-int CmdteaSelfTest(const char *Cmd){
-	
-	uint8_t v[8], v_le[8];
-	memset(v, 0x00, sizeof(v));
-	memset(v_le, 0x00, sizeof(v_le));
-	uint8_t* v_ptr = v_le;
-
-	uint8_t cmdlen = strlen(Cmd);
-	cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
-	
-	if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
-		PrintAndLog("can't read hex chars, uneven? :: %u", cmdlen);
-		return 1;
-	}
-	
-	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("TEST LE enc| %s", sprint_hex(v_ptr, 8));
-	
-	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));
-
-	return 0;
-}
-
 bool waitCmd(bool verbose) {
 
 	bool crc = FALSE;
@@ -896,7 +854,6 @@ static command_t CommandTable[] = {
 	{"sriread",		CmdHF14BReadSri,  0, "Read contents of a SRI512 | SRIX4K tag"},
 	{"sriwrite",    CmdHF14BWriteSri, 0, "Write data to a SRI512 | SRIX4K tag"},
 	//{"valid",   	srix4kValid,	1, "srix4k checksum test"},
-	//{"valid",   	CmdteaSelfTest,	1, "tea test"},
 	{NULL, NULL, 0, NULL}
 };