X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9c4e28a44540d6314c93558cc0ad162af86e63cc..165b92dc3558e43e61c3625e748e15cb270e7ab3:/client/cmdhficlass.c?ds=inline

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d4750735..3891d431 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -10,34 +10,11 @@
 // High frequency iClass commands
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include "iso14443crc.h" // Can also be used for iClass, using 0xE012 as CRC-type
-#include "data.h"
-#include "proxmark3.h"
-#include "ui.h"
-#include "cmdparser.h"
 #include "cmdhficlass.h"
-#include "common.h"
-#include "util.h"
-#include "cmdmain.h"
-#include "loclass/des.h"
-#include "loclass/cipherutils.h"
-#include "loclass/cipher.h"
-#include "loclass/ikeys.h"
-#include "loclass/elite_crack.h"
-#include "loclass/fileutils.h"
-#include "protocols.h"
-#include "usb_cmd.h"
-#include "cmdhfmfu.h"
-#include "cmdhf.h"
-
-#define llX PRIx64
 
 static int CmdHelp(const char *Cmd);
 
+#define NUM_CSNS 15
 #define ICLASS_KEYS_MAX 8
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
 		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
@@ -54,6 +31,174 @@ typedef struct iclass_block {
     uint8_t d[8];
 } iclass_block_t;
 
+int usage_hf_iclass_sim(void) {
+	PrintAndLog("Usage:  hf iclass sim <option> [CSN]");
+	PrintAndLog("        options");
+	PrintAndLog("                0 <CSN> simulate the given CSN");
+	PrintAndLog("                1       simulate default CSN");
+	PrintAndLog("                2       Reader-attack, gather reader responses to extract elite key");
+	PrintAndLog("                3       Full simulation using emulator memory (see 'hf iclass eload')");
+	PrintAndLog("        example: hf iclass sim 0 031FEC8AF7FF12E0");
+	PrintAndLog("        example: hf iclass sim 2");
+	PrintAndLog("        example: hf iclass eload 'tagdump.bin'");
+	PrintAndLog("                 hf iclass sim 3");
+	return 0;
+}
+int usage_hf_iclass_eload(void) {
+	PrintAndLog("Loads iclass tag-dump into emulator memory on device");
+	PrintAndLog("Usage:  hf iclass eload f <filename>");
+	PrintAndLog("");
+	PrintAndLog("Example: hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
+	return 0;
+}
+int usage_hf_iclass_decrypt(void) {
+	PrintAndLog("Usage: hf iclass decrypt f <tagdump>");
+	PrintAndLog("");
+	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
+	PrintAndLog("in the working directory. The file should be 16 bytes binary data");
+	PrintAndLog("");
+	PrintAndLog("example: hf iclass decrypt f tagdump_12312342343.bin");
+	PrintAndLog("");
+	PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");
+	PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
+	PrintAndLog("which is defined by the configuration block.");
+	return 1;
+}
+int usage_hf_iclass_encrypt(void) {
+	PrintAndLog("Usage: hf iclass encrypt <BlockData>");
+	PrintAndLog("");
+	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
+	PrintAndLog("in the working directory. The file should be 16 bytes binary data");
+	PrintAndLog("");
+	PrintAndLog("example: hf iclass encrypt 0102030405060708");
+	PrintAndLog("");
+	return 0;
+}
+int usage_hf_iclass_dump(void) {
+	PrintAndLog("Usage:  hf iclass dump f <fileName> k <Key> c <CreditKey> e|r\n");
+	PrintAndLog("Options:");
+	PrintAndLog("  f <filename> : specify a filename to save dump to");
+	PrintAndLog("  k <Key>      : *Access Key as 16 hex symbols or 1 hex to select key from memory");
+	PrintAndLog("  c <CreditKey>: Credit Key as 16 hex symbols or 1 hex to select key from memory");
+	PrintAndLog("  e            : If 'e' is specified, the key is interpreted as the 16 byte");
+	PrintAndLog("                 Custom Key (KCus), which can be obtained via reader-attack");
+	PrintAndLog("                 See 'hf iclass sim 2'. This key should be on iclass-format");
+	PrintAndLog("  r            : If 'r' is specified, the key is interpreted as raw block 3/4");
+	PrintAndLog("  NOTE: * = required");
+	PrintAndLog("Samples:");
+	PrintAndLog("  hf iclass dump k 001122334455667B");
+	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA c 001122334455667B");
+	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA e");
+	return 0;
+}
+int usage_hf_iclass_clone(void) {
+	PrintAndLog("Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
+	PrintAndLog("Options:");
+	PrintAndLog("  f <filename>: specify a filename to clone from");
+	PrintAndLog("  b <Block>   : The first block to clone as 2 hex symbols");
+	PrintAndLog("  l <Last Blk>: Set the Data to write as 16 hex symbols");
+	PrintAndLog("  k <Key>     : Access Key as 16 hex symbols or 1 hex to select key from memory");
+	PrintAndLog("  c           : If 'c' is specified, the key set is assumed to be the credit key\n");
+	PrintAndLog("  e           : If 'e' is specified, elite computations applied to key");
+	PrintAndLog("  r           : If 'r' is specified, no computations applied to key");
+	PrintAndLog("Samples:");
+	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 1A k 1122334455667788 e");
+	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 05 l 19 k 0");
+	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
+	return -1;
+}
+int usage_hf_iclass_writeblock(void) {
+	PrintAndLog("Options:");
+	PrintAndLog("  b <Block> : The block number as 2 hex symbols");
+	PrintAndLog("  d <data>  : Set the Data to write as 16 hex symbols");
+	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
+	PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
+	PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
+	PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
+	PrintAndLog("Samples:");
+	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA k 001122334455667B");
+	PrintAndLog("  hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
+	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA n 0");
+	return 0;
+}
+int usage_hf_iclass_readblock(void) {
+	PrintAndLog("Usage:  hf iclass readblk b <Block> k <Key> c e|r\n");
+	PrintAndLog("Options:");
+	PrintAndLog("  b <Block> : The block number as 2 hex symbols");
+	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
+	PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
+	PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
+	PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
+	PrintAndLog("Samples:");
+	PrintAndLog("  hf iclass readblk b 06 k 0011223344556677");
+	PrintAndLog("  hf iclass readblk b 1B k 0011223344556677 c");
+	PrintAndLog("  hf iclass readblk b 0A k 0");
+	return 0;
+}
+int usage_hf_iclass_readtagfile() {
+	PrintAndLog("Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
+	return 1;
+}
+int usage_hf_iclass_calc_newkey(void) {
+	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
+	PrintAndLog("Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
+	PrintAndLog("  Options:");
+	PrintAndLog("  o <oldkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
+	PrintAndLog("  n <newkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
+	PrintAndLog("  s <csn>    : specify a card Serial number to diversify the key (if omitted will attempt to read a csn)");
+	PrintAndLog("  e          : specify new key as elite calc");
+	PrintAndLog("  ee         : specify old and new key as elite calc");
+	PrintAndLog("Samples:");
+	PrintAndLog(" e key to e key given csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 s deadbeafdeadbeaf ee");
+	PrintAndLog(" std key to e key read csn: hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
+	PrintAndLog(" std to std read csn      : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
+	PrintAndLog("NOTE: * = required\n");
+	return 1;
+}
+int usage_hf_iclass_managekeys(void) {
+	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
+	PrintAndLog("Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
+	PrintAndLog("  Options:");
+	PrintAndLog("  n <keynbr>  : specify the keyNbr to set in memory");
+	PrintAndLog("  k <key>     : set a key in memory");
+	PrintAndLog("  f <filename>: specify a filename to use with load or save operations");
+	PrintAndLog("  s           : save keys in memory to file specified by filename");
+	PrintAndLog("  l           : load keys to memory from file specified by filename");
+	PrintAndLog("  p           : print keys loaded into memory\n");
+	PrintAndLog("Samples:");
+	PrintAndLog(" set key      : hf iclass managekeys n 0 k 1122334455667788");
+	PrintAndLog(" save key file: hf iclass managekeys f mykeys.bin s");
+	PrintAndLog(" load key file: hf iclass managekeys f mykeys.bin l");
+	PrintAndLog(" print keys   : hf iclass managekeys p\n");
+	return 0;
+}
+int usage_hf_iclass_reader(void) {
+	PrintAndLog("HELP :  Act as a Iclass reader:\n");
+	PrintAndLog("Usage:  hf iclass reader [h] [1]\n");
+	PrintAndLog("Options:");
+	PrintAndLog("    h   This help text");
+	PrintAndLog("    1   read only 1 tag");
+	PrintAndLog("Samples:");
+	PrintAndLog("        hf iclass reader 1");
+	return 0;
+}
+int usage_hf_iclass_replay(void){
+	PrintAndLog("HELP:   Replay a collected mac message");
+	PrintAndLog("Usage:  hf iclass replay [h] <mac>");
+	PrintAndLog("Options:");
+	PrintAndLog("    h       This help text");
+	PrintAndLog("    <mac>   Mac bytes to replay (8 hexsymbols)");
+	PrintAndLog("Samples:");
+	PrintAndLog("        hf iclass replay 00112233");	
+	return 0;
+}
+int usage_hf_iclass_snoop(void){
+	PrintAndLog("HELP:   Snoops the communication between reader and tag");
+	PrintAndLog("Usage:  hf iclass snoop [h]");
+	PrintAndLog("Samples:");
+	PrintAndLog("		 hf iclass snoop");	
+	return 0;
+}
 int xorbits_8(uint8_t val) {
 	uint8_t res = val ^ (val >> 1); //1st pass
 	res = res ^ (res >> 1); 		// 2nd pass
@@ -69,33 +214,20 @@ int CmdHFiClassList(const char *Cmd) {
 }
 
 int CmdHFiClassSnoop(const char *Cmd) {
+	char cmdp = param_getchar(Cmd, 0);
+	if (cmdp == 'h' || cmdp == 'H')	return usage_hf_iclass_snoop();
+
 	UsbCommand c = {CMD_SNOOP_ICLASS};
 	SendCommand(&c);
 	return 0;
 }
 
-int usage_hf_iclass_sim(void) {
-	PrintAndLog("Usage:  hf iclass sim <option> [CSN]");
-	PrintAndLog("        options");
-	PrintAndLog("                0 <CSN> simulate the given CSN");
-	PrintAndLog("                1       simulate default CSN");
-	PrintAndLog("                2       Reader-attack, gather reader responses to extract elite key");
-	PrintAndLog("                3       Full simulation using emulator memory (see 'hf iclass eload')");
-	PrintAndLog("        example: hf iclass sim 0 031FEC8AF7FF12E0");
-	PrintAndLog("        example: hf iclass sim 2");
-	PrintAndLog("        example: hf iclass eload 'tagdump.bin'");
-	PrintAndLog("                 hf iclass sim 3");
-	return 0;
-}
-
-#define NUM_CSNS 15
 int CmdHFiClassSim(const char *Cmd) {
 	uint8_t simType = 0;
 	uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
-	if (strlen(Cmd)<1) {
-		return usage_hf_iclass_sim();
-	}
+	if (strlen(Cmd)<1) return usage_hf_iclass_sim();
+
 	simType = param_get8ex(Cmd, 0, 0, 10);
 
 	if(simType == 0)
@@ -107,6 +239,7 @@ int CmdHFiClassSim(const char *Cmd) {
 
 		PrintAndLog("--simtype:%02x csn:%s", simType, sprint_hex(CSN, 8));
 	}
+
 	if(simType > 3)
 	{
 		PrintAndLog("Undefined simptype %d", simType);
@@ -137,7 +270,7 @@ int CmdHFiClassSim(const char *Cmd) {
 			0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0 };
 
 		memcpy(c.d.asBytes, csns, 8*NUM_CSNS);
-
+		clearCommandBuffer();
 		SendCommand(&c);
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, -1)) {
 			PrintAndLog("Command timed out");
@@ -161,42 +294,39 @@ int CmdHFiClassSim(const char *Cmd) {
 		void* dump = malloc(datalen);
 		memset(dump,0,datalen);//<-- Need zeroes for the CC-field
 		uint8_t i = 0;
-		for(i = 0 ; i < NUM_CSNS ; i++)
-		{
-			memcpy(dump+i*24, csns+i*8,8); //CSN
+		for(i = 0 ; i < NUM_CSNS ; i++) {
+			memcpy(dump+i*24, csns+i*8, 8); //CSN
 			//8 zero bytes here...
 			//Then comes NR_MAC (eight bytes from the response)
-			memcpy(dump+i*24+16,resp.d.asBytes+i*8,8);
-
+			memcpy(dump+i*24+16, resp.d.asBytes+i*8, 8);
 		}
 		/** Now, save to dumpfile **/
-		saveFile("iclass_mac_attack", "bin", dump,datalen);
+		saveFile("iclass_mac_attack", "bin", dump, datalen);
 		free(dump);
-	}else
-	{
+	} else {
 		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,numberOfCSNs}};
 		memcpy(c.d.asBytes, CSN, 8);
+		clearCommandBuffer();
 		SendCommand(&c);
 	}
-
 	return 0;
 }
 
 int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	bool tagFound = false;
-	UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN|
-					FLAG_ICLASS_READER_CONF|FLAG_ICLASS_READER_AA}};
+	UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN |
+					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AA}};
 	// loop in client not device - else on windows have a communication error
 	c.arg[0] |= FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY;
 	UsbCommand resp;
 	while(!ukbhit()){
+		clearCommandBuffer();
 		SendCommand(&c);
 		if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
-			uint8_t readStatus    = resp.arg[0] & 0xff;
+			uint8_t readStatus = resp.arg[0] & 0xff;
 			uint8_t *data = resp.d.asBytes;
 
-			if (verbose)
-			PrintAndLog("Readstatus:%02x", readStatus);
+			if (verbose) PrintAndLog("Readstatus:%02x", readStatus);
 			if( readStatus == 0){
 				//Aborted
 				if (verbose) PrintAndLog("Quitting...");
@@ -206,10 +336,8 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 				PrintAndLog("CSN: %s",sprint_hex(data,8));
 				tagFound = true;
 			}
-			if( readStatus & FLAG_ICLASS_READER_CC)  PrintAndLog("CC: %s",sprint_hex(data+16,8));
-			if( readStatus & FLAG_ICLASS_READER_CONF){
-				printIclassDumpInfo(data);
-			}
+			if( readStatus & FLAG_ICLASS_READER_CC)   PrintAndLog("CC: %s", sprint_hex(data+16, 8));
+			if( readStatus & FLAG_ICLASS_READER_CONF) printIclassDumpInfo(data);			
 			if (tagFound && !loop) return 1;
 		} else {
 			if (verbose) PrintAndLog("Command execute timeout");
@@ -219,19 +347,18 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	return 0;
 }
 
-int CmdHFiClassReader(const char *Cmd) {
-	return HFiClassReader(Cmd, true, true);
+int CmdHFiClassReader(const char *Cmd) {	
+	char cmdp = param_getchar(Cmd, 0);
+	if (cmdp == 'h' || cmdp == 'H') return usage_hf_iclass_reader();
+	bool findone = (cmdp == '1') ? FALSE : TRUE;
+	return HFiClassReader(Cmd, findone, true);
 }
 
 int CmdHFiClassReader_Replay(const char *Cmd) {
 	uint8_t readerType = 0;
 	uint8_t MAC[4]={0x00, 0x00, 0x00, 0x00};
 
-	if (strlen(Cmd)<1) {
-		PrintAndLog("Usage:  hf iclass replay <MAC>");
-		PrintAndLog("        sample: hf iclass replay 00112233");
-		return 0;
-	}
+	if (strlen(Cmd)<1) return usage_hf_iclass_replay();
 
 	if (param_gethex(Cmd, 0, MAC, 8)) {
 		PrintAndLog("MAC must include 8 HEX symbols");
@@ -240,31 +367,23 @@ int CmdHFiClassReader_Replay(const char *Cmd) {
 
 	UsbCommand c = {CMD_READER_ICLASS_REPLAY, {readerType}};
 	memcpy(c.d.asBytes, MAC, 4);
+	clearCommandBuffer();
 	SendCommand(&c);
-
 	return 0;
 }
 
 int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
 	memcpy(c.d.asBytes, data, blocksCount * 16);
+	clearCommandBuffer();
 	SendCommand(&c);
 	return 0;
 }
 
-int hf_iclass_eload_usage(void) {
-	PrintAndLog("Loads iclass tag-dump into emulator memory on device");
-	PrintAndLog("Usage:  hf iclass eload f <filename>");
-	PrintAndLog("");
-	PrintAndLog("Example: hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
-	return 0;
-}
-
 int CmdHFiClassELoad(const char *Cmd) {
 
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return hf_iclass_eload_usage();
+	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_eload();
 
 	//File handling and reading
 	FILE *f;
@@ -272,7 +391,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 	if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0) {
 		f = fopen(filename, "rb");
 	} else {
-		return hf_iclass_eload_usage();
+		return usage_hf_iclass_eload();
 	}
 
 	if(!f) {
@@ -286,10 +405,10 @@ int CmdHFiClassELoad(const char *Cmd) {
 
 	if (fsize < 0) 	{
 		prnlog("Error, when getting filesize");
+		fclose(f);
 		return 1;
 	}
 
-
 	uint8_t *dump = malloc(fsize);
 
 	size_t bytes_read = fread(dump, 1, fsize, f);
@@ -298,8 +417,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 	printIclassDumpInfo(dump);
 	//Validate
 
-	if (bytes_read < fsize)
-	{
+	if (bytes_read < fsize)	{
 		prnlog("Error, could only read %d bytes (should be %d)",bytes_read, fsize );
 		free(dump);
 		return 1;
@@ -312,6 +430,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 		uint32_t bytes_in_packet = MIN(USB_CMD_DATA_SIZE, bytes_remaining);
 		UsbCommand c = {CMD_ICLASS_EML_MEMSET, {bytes_sent,bytes_in_packet,0}};
 		memcpy(c.d.asBytes, dump, bytes_in_packet);
+		clearCommandBuffer();
 		SendCommand(&c);
 		bytes_remaining -= bytes_in_packet;
 		bytes_sent += bytes_in_packet;
@@ -332,111 +451,110 @@ static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
 	fseek(f, 0, SEEK_SET);
 	size_t bytes_read = fread(buffer, 1, len, f);
 	fclose(f);
-	if(fsize != len)
-	{
+	
+	if(fsize != len) {
 		PrintAndLog("Warning, file size is %d, expected %d", fsize, len);
 		return 1;
 	}
-	if(bytes_read != len)
-	{
+	
+	if(bytes_read != len) {
 		PrintAndLog("Warning, could only read %d bytes, expected %d" ,bytes_read, len);
 		return 1;
 	}
 	return 0;
 }
 
-int usage_hf_iclass_decrypt(void) {
-	PrintAndLog("Usage: hf iclass decrypt f <tagdump>");
-	PrintAndLog("");
-	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
-	PrintAndLog("in the working directory. The file should be 16 bytes binary data");
-	PrintAndLog("");
-	PrintAndLog("example: hf iclass decrypt f tagdump_12312342343.bin");
-	PrintAndLog("");
-	PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");
-	PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
-	PrintAndLog("which is defined by the configuration block.");
-	return 1;
-}
-
 int CmdHFiClassDecrypt(const char *Cmd) {
-	uint8_t key[16] = { 0 };
-	if(readKeyfile("iclass_decryptionkey.bin", 16, key))
-	{
-		usage_hf_iclass_decrypt();
-		return 1;
-	}
-	PrintAndLog("Decryption file found... ");
+
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return usage_hf_iclass_decrypt();
+	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_decrypt();
+	
+	uint8_t key[16] = { 0 };
+	if(readKeyfile("iclass_decryptionkey.bin", 16, key)) return usage_hf_iclass_decrypt();
+	
+	PrintAndLog("Decryption key loaded from file [ok]");
 
 	//Open the tagdump-file
 	FILE *f;
 	char filename[FILE_PATH_SIZE];
-	if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0)
-	{
+	if(opt == 'f' && param_getstr(Cmd, 1, filename) > 0) {
 		f = fopen(filename, "rb");
-	}else{
+		if (!f) {
+			PrintAndLog("Could not find file %s", filename);
+			return 1;
+		}		
+	} else {
 		return usage_hf_iclass_decrypt();
-	}
+	}	
 
 	fseek(f, 0, SEEK_END);
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
-	uint8_t enc_dump[8] = {0};
+		
+	if ( fsize < 0 ) {
+		PrintAndLog("Error, when getting filesize");
+		fclose(f);
+		return 2;
+	}
+	
 	uint8_t *decrypted = malloc(fsize);
-	des3_context ctx = { DES_DECRYPT ,{ 0 } };
-	des3_set2key_dec( &ctx, key);
-	size_t bytes_read = fread(enc_dump, 1, 8, f);
+	
+	size_t bytes_read = fread(decrypted, 1, fsize, f);
+	fclose(f);
+	if ( bytes_read == 0) {
+		PrintAndLog("File reading error");
+		free(decrypted);
+		return 3;
+	}
 
+	picopass_hdr *hdr = (picopass_hdr *)decrypted;
+		
+	uint8_t mem = hdr->conf.mem_config;
+	uint8_t chip = hdr->conf.chip_config;
+	uint8_t applimit = hdr->conf.app_limit;
+	uint8_t kb = 2;
+	uint8_t app_areas = 2;
+	uint8_t max_blk = 31;
+	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);	
+	
 	//Use the first block (CSN) for filename
-	char outfilename[FILE_PATH_SIZE] = { 0 };
-	snprintf(outfilename,FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
-			 enc_dump[0],enc_dump[1],enc_dump[2],enc_dump[3],
-			 enc_dump[4],enc_dump[5],enc_dump[6],enc_dump[7]);
+	char outfilename[FILE_PATH_SIZE] = {0};
+	snprintf(outfilename, FILE_PATH_SIZE, "iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x-decrypted",
+			 hdr->csn[0],hdr->csn[1],hdr->csn[2],hdr->csn[3],
+			 hdr->csn[4],hdr->csn[5],hdr->csn[6],hdr->csn[7]);
 
-	size_t blocknum =0;
-	while(bytes_read == 8)
-	{
-		if(blocknum < 7)
-		{
-			memcpy(decrypted+(blocknum*8), enc_dump, 8);
-		}else{
-			des3_crypt_ecb(&ctx, enc_dump,decrypted +(blocknum*8) );
+	// tripledes
+	des3_context ctx = { DES_DECRYPT ,{ 0 } };
+	des3_set2key_dec( &ctx, key);
+
+	uint8_t enc_dump[8] = {0};
+	uint8_t empty[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+	for(uint16_t blocknum=0; blocknum < applimit; ++blocknum) {
+		
+		uint8_t idx = blocknum*8;
+		memcpy(enc_dump, decrypted + idx, 8);
+		
+		// block 7 or higher,  and not empty 0xFF
+		if(blocknum > 6 &&  memcmp(enc_dump, empty, 8) != 0 ) {
+			des3_crypt_ecb(&ctx, enc_dump, decrypted + idx );
 		}
-		printvar("decrypted block", decrypted +(blocknum*8), 8);
-		bytes_read = fread(enc_dump, 1, 8, f);
-		blocknum++;
+		//printvar("decrypted block", decrypted + idx, 8);
 	}
-	fclose(f);
-
-	saveFile(outfilename,"bin", decrypted, blocknum*8);
-
+	
+	saveFile(outfilename, "bin", decrypted, fsize);
 	free(decrypted);
-	return 0;
-}
-
-int usage_hf_iclass_encrypt(void) {
-	PrintAndLog("Usage: hf iclass encrypt <BlockData>");
-	PrintAndLog("");
-	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
-	PrintAndLog("in the working directory. The file should be 16 bytes binary data");
-	PrintAndLog("");
-	PrintAndLog("example: hf iclass encrypt 0102030405060708");
-	PrintAndLog("");
+	
+	printIclassDumpContents(decrypted, 1, (fsize/8), fsize);
 	return 0;
 }
 
 static int iClassEncryptBlkData(uint8_t *blkData) {
 	uint8_t key[16] = { 0 };
-	if(readKeyfile("iclass_decryptionkey.bin", 16, key))
-	{
+	if(readKeyfile("iclass_decryptionkey.bin", 16, key)) {
 		usage_hf_iclass_encrypt();
 		return 1;
 	}
 	PrintAndLog("Decryption file found... ");
-
 	uint8_t encryptedData[16];
 	uint8_t *encrypted = encryptedData;
 	des3_context ctx = { DES_DECRYPT ,{ 0 } };
@@ -452,12 +570,10 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 int CmdHFiClassEncryptBlk(const char *Cmd) {
 	uint8_t blkData[8] = {0};
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return usage_hf_iclass_encrypt();
+	if (strlen(Cmd)<1 || opt == 'h' || opt == 'H') return usage_hf_iclass_encrypt();
 
 	//get the bytes to encrypt
-	if (param_gethex(Cmd, 0, blkData, 16))
-	{
+	if (param_gethex(Cmd, 0, blkData, 16)) {
 		PrintAndLog("BlockData must include 16 HEX symbols");
 		return 0;
 	}
@@ -485,8 +601,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 
 	clearCommandBuffer();
 	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
 		PrintAndLog("Command execute timeout");
 		return false;
 	}
@@ -495,11 +610,14 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 	uint8_t *data = resp.d.asBytes;
 
 	memcpy(CSN,data,8);
-	if (CCNR!=NULL)memcpy(CCNR,data+16,8);
-	if(isOK > 0)
-	{
+	
+	if (CCNR!=NULL) 
+		memcpy(CCNR,data+16,8);
+	
+	if(isOK > 0) {
 		if (verbose) PrintAndLog("CSN: %s",sprint_hex(CSN,8));
 	}
+	
 	if(isOK <= 1){
 		PrintAndLog("Failed to obtain CC! Aborting");
 		return false;
@@ -518,7 +636,8 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 	if(rawkey)
 		memcpy(div_key, KEY, 8);
 	else
-	HFiClassCalcDivKey(CSN, KEY, div_key, elite);
+		HFiClassCalcDivKey(CSN, KEY, div_key, elite);
+	
 	PrintAndLog("Authing with %s: %02x%02x%02x%02x%02x%02x%02x%02x", rawkey ? "raw key" : "diversified key", div_key[0],div_key[1],div_key[2],div_key[3],div_key[4],div_key[5],div_key[6],div_key[7]);
 
 	doMAC(CCNR, div_key, MAC);
@@ -527,12 +646,11 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 	memcpy(d.d.asBytes, MAC, 4);
 	clearCommandBuffer();
 	SendCommand(&d);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
 		PrintAndLog("Auth Command execute timeout");
 		return false;
 	}
-		uint8_t isOK    = resp.arg[0] & 0xff;
+	uint8_t isOK = resp.arg[0] & 0xff;
 	if (!isOK) {
 		PrintAndLog("Authentication error");
 		return false;
@@ -540,24 +658,6 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 	return true;
 }
 
-int usage_hf_iclass_dump(void) {
-	PrintAndLog("Usage:  hf iclass dump f <fileName> k <Key> c <CreditKey> e|r\n");
-	PrintAndLog("Options:");
-	PrintAndLog("  f <filename> : specify a filename to save dump to");
-	PrintAndLog("  k <Key>      : *Access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLog("  c <CreditKey>: Credit Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLog("  e            : If 'e' is specified, the key is interpreted as the 16 byte");
-	PrintAndLog("                 Custom Key (KCus), which can be obtained via reader-attack");
-	PrintAndLog("                 See 'hf iclass sim 2'. This key should be on iclass-format");
-	PrintAndLog("  r            : If 'r' is specified, the key is interpreted as raw block 3/4");
-	PrintAndLog("  NOTE: * = required");
-  PrintAndLog("Samples:");
-	PrintAndLog("  hf iclass dump k 001122334455667B");
-	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA c 001122334455667B");
-	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA e");
-	return 0;
-}
-
 int CmdHFiClassReader_Dump(const char *Cmd) {
 
 	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
@@ -598,7 +698,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, CreditKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(CreditKEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -632,7 +732,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -675,21 +775,23 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		return 0;
 	}
 	uint8_t readStatus = resp.arg[0] & 0xff;
-		uint8_t * data  = resp.d.asBytes;
+	uint8_t * data  = resp.d.asBytes;
 
 	if(readStatus == 0){
 		PrintAndLog("No tag found...");
 		ul_switch_off_field();
-	return 0;
-}
-	if( readStatus & (FLAG_ICLASS_READER_CSN|FLAG_ICLASS_READER_CONF|FLAG_ICLASS_READER_CC)){
+		return 0;
+	}
+	
+	if( readStatus & (FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_CC)){
 		memcpy(tag_data, data, 8*3);
-		blockno+=2; // 2 to force re-read of block 2 later. (seems to respond differently..)
+		blockno += 2; // 2 to force re-read of block 2 later. (seems to respond differently..)
 		numblks = data[8];
 		getMemConfig(data[13], data[12], &maxBlk, &app_areas, &kb);
 		// large memory - not able to dump pages currently
 		if (numblks > maxBlk) numblks = maxBlk;
 	}
+	
 	ul_switch_off_field();
 	// authenticate debit key and get div_key - later store in dump block 3
 	if (!select_and_auth(KEY, MAC, div_key, use_credit_key, elite, rawkey, false)){
@@ -777,10 +879,14 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 	// add diversified keys to dump
 	if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
 	if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
+	
+	printf("Num of bytes:  %zu\n", gotBytes);
+	
 	// print the dump
-	printf("CSN   |00| %02X %02X %02X %02X %02X %02X %02X %02X |\n",tag_data[0],tag_data[1],tag_data[2]
-		  ,tag_data[3],tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
-	printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8);
+	printf("------+--+-------------------------+\n");
+	printf("CSN   |00| %s|\n", sprint_hex(tag_data, 8));	
+	//printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8);
+	printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
 
 	if (filename[0] == 0){
 		snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
@@ -809,8 +915,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
 	
 	clearCommandBuffer();
 	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
 		PrintAndLog("Write Command execute timeout");
 		return 0;
 	}
@@ -823,21 +928,6 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
 	return 1;
 }
 
-int usage_hf_iclass_writeblock(void) {
-	PrintAndLog("Options:");
-  PrintAndLog("  b <Block> : The block number as 2 hex symbols");
-  PrintAndLog("  d <data>  : Set the Data to write as 16 hex symbols");
-	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
-  PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
-  PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
-  PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
-  PrintAndLog("Samples:");
-	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA k 001122334455667B");
-	PrintAndLog("  hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
-	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA n 0");
-	return 0;
-}
-
 int CmdHFiClass_WriteBlock(const char *Cmd) {
 	uint8_t blockno=0;
 	uint8_t bldata[8]={0,0,0,0,0,0,0,0};
@@ -891,7 +981,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -922,25 +1012,8 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 	return ans;
 }
 
-int usage_hf_iclass_clone(void) {
-	PrintAndLog("Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
-	PrintAndLog("Options:");
-	PrintAndLog("  f <filename>: specify a filename to clone from");
-	PrintAndLog("  b <Block>   : The first block to clone as 2 hex symbols");
-	PrintAndLog("  l <Last Blk>: Set the Data to write as 16 hex symbols");
-	PrintAndLog("  k <Key>     : Access Key as 16 hex symbols or 1 hex to select key from memory");
-	PrintAndLog("  c           : If 'c' is specified, the key set is assumed to be the credit key\n");
-	PrintAndLog("  e           : If 'e' is specified, elite computations applied to key");
-	PrintAndLog("  r           : If 'r' is specified, no computations applied to key");
-	PrintAndLog("Samples:");
-	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 1A k 1122334455667788 e");
-	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 05 l 19 k 0");
-	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
-	return -1;
-}
-
 int CmdHFiClassCloneTag(const char *Cmd) {
-	char filename[FILE_PATH_SIZE];
+	char filename[FILE_PATH_SIZE] = { 0x00 };
 	char tempStr[50]={0};
 	uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t keyNbr = 0;
@@ -994,7 +1067,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -1045,6 +1118,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 
 	if (startblock<5) {
 		PrintAndLog("You cannot write key blocks this way. yet... make your start block > 4");
+		fclose(f);	
 		return 0;
 	}
 	// now read data from the file from block 6 --- 19
@@ -1053,7 +1127,8 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	// else we have to create a share memory
 	int i;
 	fseek(f,startblock*8,SEEK_SET);
-	if ( fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f) == 0){
+	size_t bytes_read = fread(tag_data,sizeof(iclass_block_t),endblock - startblock + 1,f);
+	if ( bytes_read == 0){
 		PrintAndLog("File reading error.");
 		fclose(f);
 		return 2;
@@ -1086,9 +1161,9 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	    printf(" MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
 	}
 	UsbCommand resp;
+	clearCommandBuffer();
 	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
 		PrintAndLog("Command execute timeout");
 		return 0;
 	}
@@ -1106,11 +1181,11 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 	UsbCommand w = {CMD_ICLASS_READBLOCK, {blockno}};
 	clearCommandBuffer();
 	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
 		PrintAndLog("Command execute timeout");
 		return 0;
 	}
+	
 	uint8_t isOK = resp.arg[0] & 0xff;
 	if (!isOK) {
 		PrintAndLog("Read Block Failed");
@@ -1121,21 +1196,6 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 	return 1;
 }
 
-int usage_hf_iclass_readblock(void) {
-	PrintAndLog("Usage:  hf iclass readblk b <Block> k <Key> c e|r\n");
-	PrintAndLog("Options:");
-  PrintAndLog("  b <Block> : The block number as 2 hex symbols");
-	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
-  PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
-  PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
-  PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
-  PrintAndLog("Samples:");
-	PrintAndLog("  hf iclass readblk b 06 k 0011223344556677");
-	PrintAndLog("  hf iclass readblk b 1B k 0011223344556677 c");
-	PrintAndLog("  hf iclass readblk b 0A k 0");
-	return 0;
-}
-
 int CmdHFiClass_ReadBlock(const char *Cmd) {
 	uint8_t blockno=0;
 	uint8_t keyType = 0x88; //debit key
@@ -1179,7 +1239,7 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -1220,7 +1280,7 @@ int CmdHFiClass_loclass(const char *Cmd) {
 		PrintAndLog("f <filename>  Bruteforce iclass dumpfile");
 		PrintAndLog("                   An iclass dumpfile is assumed to consist of an arbitrary number of");
 		PrintAndLog("                   malicious CSNs, and their protocol responses");
-		PrintAndLog("                   The the binary format of the file is expected to be as follows: ");
+		PrintAndLog("                   The binary format of the file is expected to be as follows: ");
 		PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
 		PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
 		PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
@@ -1228,65 +1288,57 @@ int CmdHFiClass_loclass(const char *Cmd) {
 		return 0;
 	}
 	char fileName[255] = {0};
-	if(opt == 'f')
-	{
-		if(param_getstr(Cmd, 1, fileName) > 0)
-		{
+	if(opt == 'f') 	{
+		if(param_getstr(Cmd, 1, fileName) > 0) {
 			return bruteforceFileNoKeys(fileName);
-		}else
-		{
+		} else {
 			PrintAndLog("You must specify a filename");
+			// no return?
 		}
 	}
-	else if(opt == 't')
-	{
+	else if(opt == 't') {
 		int errors = testCipherUtils();
 		errors += testMAC();
 		errors += doKeyTests(0);
 		errors += testElite();
-		if(errors)
-		{
-			prnlog("OBS! There were errors!!!");
-		}
+		if(errors) prnlog("OBS! There were errors!!!");
 		return errors;
 	}
-
 	return 0;
 }
 
 void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
-	uint8_t blockdata[8];
 	uint8_t mem_config;
 	memcpy(&mem_config, iclass_dump + 13,1);
 	uint8_t maxmemcount;
+	
 	uint8_t filemaxblock = filesize / 8;
+
 	if (mem_config & 0x80)
 		maxmemcount = 255;
 	else
 		maxmemcount = 31;
-	//PrintAndLog	("endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d", endblock,filesize, maxmemcount, filemaxblock);
 
 	if (startblock == 0)
 		startblock = 6;
+	
 	if ((endblock > maxmemcount) || (endblock == 0))
 		endblock = maxmemcount;
-	if (endblock > filemaxblock)
-		endblock = filemaxblock;
+	
+	// remember endblock needs to relate to zero-index arrays.
+	if (endblock > filemaxblock-1)
+		endblock = filemaxblock-1;
+
+	//PrintAndLog	("startblock: %d, endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d",startblock, endblock,filesize, maxmemcount, filemaxblock);
+	
 	int i = startblock;
-	int j;
+	printf("------+--+-------------------------+\n");
 	while (i <= endblock){
-		printf("Block |%02X| ",i);
-		memcpy(blockdata,iclass_dump + (i * 8),8);
-		for (j = 0;j < 8;j++)
-			printf("%02X ",blockdata[j]);
-		printf("|\n");
+		uint8_t *blk = iclass_dump + (i * 8);
+		printf("Block |%02X| %s\n", i, sprint_hex_ascii(blk, 8) );	
 		i++;
 	}
-}
-
-int usage_hf_iclass_readtagfile() {
-	PrintAndLog("Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
-	return 1;
+	printf("------+--+-------------------------+\n");
 }
 
 int CmdHFiClassReadTagFile(const char *Cmd) {
@@ -1297,6 +1349,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 	char filename[FILE_PATH_SIZE];
 	if (param_getstr(Cmd, 0, filename) < 1)
 		return usage_hf_iclass_readtagfile();
+	
 	if (param_getstr(Cmd,1,(char *)&tempnum) < 1)
 		startblock = 0;
 	else
@@ -1306,6 +1359,7 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 		endblock = 0;
 	else
 		sscanf(tempnum,"%d",&endblock);
+	
 	// file handling and reading
 	f = fopen(filename,"rb");
 	if(!f) {
@@ -1316,38 +1370,24 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
 
-	uint8_t *dump = malloc(fsize);
-
+	if ( fsize < 0 ) {
+		PrintAndLog("Error, when getting filesize");
+		fclose(f);
+		return 1;
+	}
 
+	uint8_t *dump = malloc(fsize);
 	size_t bytes_read = fread(dump, 1, fsize, f);
 	fclose(f);
+	
 	uint8_t *csn = dump;
-	printf("CSN   [00] | %02X %02X %02X %02X %02X %02X %02X %02X |\n",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
-	//    printIclassDumpInfo(dump);
-	printIclassDumpContents(dump,startblock,endblock,bytes_read);
+	printf("------+--+-------------------------+\n");
+	printf("CSN   |00| %s|\n", sprint_hex(csn, 8) );
+	printIclassDumpContents(dump, startblock, endblock, bytes_read);
 	free(dump);
 	return 0;
 }
 
-/*
-uint64_t xorcheck(uint64_t sdiv,uint64_t hdiv) {
-	uint64_t new_div = 0x00;
-	new_div ^= sdiv;
-	new_div ^= hdiv;
-	return new_div;
-}
-
-uint64_t hexarray_to_uint64(uint8_t *key) {
-	char temp[17];
-	uint64_t uint_key;
-	for (int i = 0;i < 8;i++)
-		sprintf(&temp[(i *2)],"%02X",key[i]);
-	temp[16] = '\0';
-	if (sscanf(temp,"%016"llX,&uint_key) < 1)
-		return 0;
-	return uint_key;
-}
-*/
 void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t	*KEY, uint8_t *div_key, bool elite){
 	uint8_t keytable[128] = {0};
 	uint8_t key_index[8] = {0};
@@ -1382,30 +1422,12 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
 		xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
 	}
 	if (verbose) {
-		printf("Old Div Key : %s\n",sprint_hex(old_div_key,8));
-		printf("New Div Key : %s\n",sprint_hex(new_div_key,8));
-		printf("Xor Div Key : %s\n",sprint_hex(xor_div_key,8));		
+		printf("Old div key : %s\n",sprint_hex(old_div_key,8));
+		printf("New div key : %s\n",sprint_hex(new_div_key,8));
+		printf("Xor div key : %s\n",sprint_hex(xor_div_key,8));		
 	}
 }
 
-int usage_hf_iclass_calc_newkey(void) {
-	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
-	PrintAndLog("Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
-	PrintAndLog("  Options:");
-	PrintAndLog("  o <oldkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
-	PrintAndLog("  n <newkey> : *specify a key as 16 hex symbols or a key number as 1 symbol");
-	PrintAndLog("  s <csn>    : specify a card Serial number to diversify the key (if omitted will attempt to read a csn)");
-	PrintAndLog("  e          : specify new key as elite calc");
-	PrintAndLog("  ee         : specify old and new key as elite calc");
-	PrintAndLog("Samples:");
-	PrintAndLog(" e key to e key given csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899 s deadbeafdeadbeaf ee");
-	PrintAndLog(" std key to e key read csn: hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
-	PrintAndLog(" std to std read csn      : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
-	PrintAndLog("NOTE: * = required\n");
-
-	return 1;
-}
-
 int CmdHFiClassCalcNewKey(const char *Cmd) {
 	uint8_t OLDKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t NEWKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -1442,7 +1464,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(NEWKEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: NewKey Nbr is invalid\n");
@@ -1461,7 +1483,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 				errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr <= ICLASS_KEYS_MAX) {
+				if (keyNbr < ICLASS_KEYS_MAX) {
 					memcpy(OLDKEY, iClass_Key_Table[keyNbr], 8);
 				} else {
 					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
@@ -1509,6 +1531,12 @@ static int loadKeys(char *filename) {
 	long fsize = ftell(f);
 	fseek(f, 0, SEEK_SET);
 
+	if ( fsize < 0 ) {
+		PrintAndLog("Error, when getting filesize");
+		fclose(f);
+		return 1;
+	}
+
 	uint8_t *dump = malloc(fsize);
 
 	size_t bytes_read = fread(dump, 1, fsize, f);
@@ -1519,9 +1547,9 @@ static int loadKeys(char *filename) {
 		return 0;
 	}
 	uint8_t i = 0;
-	for (; i < bytes_read/8; i++){
+	for (; i < bytes_read/8; i++)
 		memcpy(iClass_Key_Table[i],dump+(i*8),8);
-	}
+	
 	free(dump);
 	PrintAndLog("%u keys loaded", i);
 	return 1;
@@ -1530,7 +1558,7 @@ static int loadKeys(char *filename) {
 static int saveKeys(char *filename) {
 	FILE *f;
 	f = fopen(filename,"wb");
-	if (f == NULL) {
+	if (!f) {
 		printf("error opening file %s\n",filename);
 		return 0;
 	}
@@ -1546,31 +1574,12 @@ static int saveKeys(char *filename) {
 
 static int printKeys(void) {
 	PrintAndLog("");
-	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){
-		PrintAndLog("%u: %s",i,sprint_hex(iClass_Key_Table[i],8));
-	}
+	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
+		PrintAndLog("%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
 	PrintAndLog("");	
 	return 0;
 }
 
-int usage_hf_iclass_managekeys(void) {
-	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
-	PrintAndLog("Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
-	PrintAndLog("  Options:");
-	PrintAndLog("  n <keynbr>  : specify the keyNbr to set in memory");
-	PrintAndLog("  k <key>     : set a key in memory");
-	PrintAndLog("  f <filename>: specify a filename to use with load or save operations");
-	PrintAndLog("  s           : save keys in memory to file specified by filename");
-	PrintAndLog("  l           : load keys to memory from file specified by filename");
-	PrintAndLog("  p           : print keys loaded into memory\n");
-	PrintAndLog("Samples:");
-	PrintAndLog(" set key      : hf iclass managekeys n 0 k 1122334455667788");
-	PrintAndLog(" save key file: hf iclass managekeys f mykeys.bin s");
-	PrintAndLog(" load key file: hf iclass managekeys f mykeys.bin l");
-	PrintAndLog(" print keys   : hf iclass managekeys p\n");
-	return 0;
-}
-
 int CmdHFiClassManageKeys(const char *Cmd) {
 	uint8_t keyNbr = 0;
 	uint8_t dataLen = 0;
@@ -1601,7 +1610,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 		case 'n':
 		case 'N':
 			keyNbr = param_get8(Cmd, cmdp+1);
-			if (keyNbr < 0) {
+			if (keyNbr == 0) {
 				PrintAndLog("Wrong block number");
 				errors = true;
 			}
@@ -1664,9 +1673,8 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 	return 0;
 }
 
-static command_t CommandTable[] = 
-{
-	{"help",	CmdHelp,			1,	"This help"},
+static command_t CommandTable[] = {
+	{"help",		CmdHelp,						1,	"This help"},
 	{"calcnewkey",  CmdHFiClassCalcNewKey,      	1,	"[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
 	{"clone",       CmdHFiClassCloneTag,        	0,	"[options..] Authenticate and Clone from iClass bin file"},
 	{"decrypt",     CmdHFiClassDecrypt,         	1,	"[f <fname>] Decrypt tagdump" },
@@ -1677,7 +1685,7 @@ static command_t CommandTable[] =
 	{"loclass",     CmdHFiClass_loclass,        	1,	"[options..] Use loclass to perform bruteforce of reader attack dump"},
 	{"managekeys",  CmdHFiClassManageKeys,      	1,	"[options..] Manage the keys to use with iClass"},
 	{"readblk",     CmdHFiClass_ReadBlock,      	0,	"[options..] Authenticate and Read iClass block"},
-	{"reader",CmdHFiClassReader,	0,	"Read an iClass tag"},
+	{"reader",		CmdHFiClassReader,				0,	"Read an iClass tag"},
 	{"readtagfile", CmdHFiClassReadTagFile,     	1,	"[options..] Display Content from tagfile"},
 	{"replay",      CmdHFiClassReader_Replay,   	0,	"<mac>       Read an iClass tag via Reply Attack"},
 	{"sim",         CmdHFiClassSim,             	0,	"[options..] Simulate iClass tag"},
@@ -1686,14 +1694,13 @@ static command_t CommandTable[] =
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdHFiClass(const char *Cmd)
-{
+int CmdHFiClass(const char *Cmd) {
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
 	CmdsHelp(CommandTable);
 	return 0;
 }