From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 1 Jul 2015 06:17:00 +0000 (+0200)
Subject: Merge branch 'master' into topaz
X-Git-Tag: v2.3.0~20^2~3
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/db2b81ba11bdb125a7ee22b226729f4c70acb1ad?hp=--cc

Merge branch 'master' into topaz

Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
---

db2b81ba11bdb125a7ee22b226729f4c70acb1ad
diff --cc client/Makefile
index 48cbdfaa,c454533d..f768f3d8
--- a/client/Makefile
+++ b/client/Makefile
@@@ -57,51 -57,57 +57,58 @@@ CORESRCS = 	uart.c 
  
  
  CMDSRCS = 	nonce2key/crapto1.c\
--		nonce2key/crypto1.c\
--		nonce2key/nonce2key.c\
--		loclass/cipher.c \
--		loclass/cipherutils.c \
--		loclass/des.c \
--		loclass/ikeys.c \
--		loclass/elite_crack.c\
--		loclass/fileutils.c\
- 		mifarehost.c\
- 		crc.c \
- 		crc16.c \
- 		iso14443crc.c \
- 		iso15693tools.c \
- 		data.c \
- 		graph.c \
- 		ui.c \
- 		cmddata.c \
- 		lfdemod.c \
- 		cmdhf.c \
- 		cmdhf14a.c \
- 		cmdhf14b.c \
- 		cmdhf15.c \
- 		cmdhfepa.c \
- 		cmdhflegic.c \
- 		cmdhficlass.c \
- 		cmdhfmf.c \
-         cmdhfmfu.c \
- 		cmdhftopaz.c \
- 		cmdhw.c \
- 		cmdlf.c \
- 		cmdlfio.c \
- 		cmdlfhid.c \
- 		cmdlfem4x.c \
- 		cmdlfhitag.c \
- 		cmdlfti.c \
- 		cmdparser.c \
- 		cmdmain.c \
- 		cmdlft55xx.c \
- 		cmdlfpcf7931.c\
- 		pm3_binlib.c\
- 		scripting.c\
- 		cmdscript.c\
- 		pm3_bitlib.c\
- 		aes.c\
- 		protocols.c
++			nonce2key/crypto1.c\
++			nonce2key/nonce2key.c\
++			loclass/cipher.c \
++			loclass/cipherutils.c \
++			loclass/des.c \
++			loclass/ikeys.c \
++			loclass/elite_crack.c\
++			loclass/fileutils.c\
+ 			mifarehost.c\
+ 			crc.c \
+ 			crc16.c \
+ 			crc64.c \
+ 			iso14443crc.c \
+ 			iso15693tools.c \
+ 			data.c \
+ 			graph.c \
+ 			ui.c \
+ 			cmddata.c \
+ 			lfdemod.c \
+ 			cmdhf.c \
+ 			cmdhf14a.c \
+ 			cmdhf14b.c \
+ 			cmdhf15.c \
+ 			cmdhfepa.c \
+ 			cmdhflegic.c \
+ 			cmdhficlass.c \
+ 			cmdhfmf.c \
+             cmdhfmfu.c \
++			cmdhftopaz.c \
+ 			cmdhw.c \
+ 			cmdlf.c \
+ 			cmdlfio.c \
+ 			cmdlfhid.c \
+ 			cmdlfem4x.c \
+ 			cmdlfhitag.c \
+ 			cmdlfti.c \
+ 			cmdparser.c \
+ 			cmdmain.c \
+ 			cmdlft55xx.c \
+ 			cmdlfpcf7931.c\
+ 			pm3_binlib.c\
+ 			scripting.c\
+ 			cmdscript.c\
+ 			pm3_bitlib.c\
+ 			aes.c\
+ 			protocols.c\
+ 			sha1.c\
+ 
+ ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
+ ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
+ #-DDEBUG -Dverbose=1
+ 
  
  COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
  CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
diff --cc client/cmdhf.c
index ad8e5369,4c5db589..4777a0f4
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@@ -438,10 -378,11 +484,10 @@@ uint16_t printTraceLine(uint16_t tracep
  			oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
  		}
  		uint8_t parityBits = parityBytes[j>>3];
- 		if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
- 			snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x!", frame[j]);
+ 		if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+ 			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
 -
  		} else {
 -			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
 +			snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);
  		}
  
  	}
@@@ -618,19 -578,19 +690,35 @@@ int CmdHFSearch(const char *Cmd)
  
  static command_t CommandTable[] = 
  {
++<<<<<<< HEAD
 +	{"help",	CmdHelp,		1, "This help"},
 +	{"14a",		CmdHF14A,		1, "{ ISO14443A RFIDs... }"},
 +	{"14b",		CmdHF14B,		1, "{ ISO14443B RFIDs... }"},
 +	{"15",		CmdHF15,		1, "{ ISO15693 RFIDs... }"},
 +	{"epa",		CmdHFEPA,		1, "{ German Identification Card... }"},
 +	{"legic",	CmdHFLegic,		0, "{ LEGIC RFIDs... }"},
 +	{"iclass",	CmdHFiClass,	1, "{ ICLASS RFIDs... }"},
 +	{"mf",		CmdHFMF,		1, "{ MIFARE RFIDs... }"},
 +	{"mfu",		CmdHFMFUltra,	1, "{ MIFARE Ultralight RFIDs... }"},
 +	{"topaz",	CmdHFTopaz,		1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
 +	{"tune",	CmdHFTune,		0, "Continuously measure HF antenna tuning"},
 +	{"list",	CmdHFList,		1, "List protocol data in trace buffer"},
 +	{NULL,		NULL,			0, NULL}
++=======
+   {"help",        CmdHelp,          1, "This help"},
+   {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs... }"},
+   {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
+   {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
+   {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
+   {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
+   {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
+   {"mf",          CmdHFMF,          1, "{ MIFARE RFIDs... }"},
+   {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},
+   {"tune",        CmdHFTune,        0, "Continuously measure HF antenna tuning"},
+   {"list",        CmdHFList,        1, "List protocol data in trace buffer"},
+   {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
+ 	{NULL, NULL, 0, NULL}
++>>>>>>> master
  };
  
  int CmdHF(const char *Cmd)
diff --cc client/cmdhf14a.c
index 214ff1ec,9a761864..cba179ec
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@@ -140,10 -141,10 +141,10 @@@ int CmdHF14AReader(const char *Cmd
  	iso14a_card_select_t card;
  	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
  
 -	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
 +	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
  	
  	if(select_status == 0) {
- 		PrintAndLog("iso14443a card select failed");
+ 		if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
  		// disconnect
  		c.arg[0] = 0;
  		c.arg[1] = 0;