From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 3 Nov 2015 20:06:59 +0000 (+0100)
Subject: Merge branch 'topaz'
X-Git-Tag: v2.3.0~20
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b2fe0e77c5d46dd5bed439c55446c32b3cc13a17?ds=sidebyside;hp=--cc

Merge branch 'topaz'

Conflicts:
	CHANGELOG.md
	client/cmdhf.c
---

b2fe0e77c5d46dd5bed439c55446c32b3cc13a17
diff --cc CHANGELOG.md
index 6eb9a400,33824bbb..80c16ffa
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,11 -10,11 +16,13 @@@ This project uses the changelog in acco
  - Added 'hw status'. This command makes the ARM print out some runtime information. (holiman) 
  - Added 'hw ping'. This command just sends a usb packets and checks if the pm3 is responsive. Can be used to abort certain operations which supports abort over usb. (holiman)
  - Added `data hex2bin` and `data bin2hex` for command line conversion between binary and hexadecimal (holiman)
 +- Added 'hf snoop'. This command take digitalized signal from FPGA and put in BigBuffer. (pwpiwi + enio)
+ - Added Topaz (NFC type 1) protocol support ('hf topaz reader', 'hf list topaz', 'hf 14a raw -T', 'hf topaz snoop'). (piwi)
+ - Added option c to 'hf list' (mark CRC bytes) (piwi)
  
 -
  ### Changed
 +- changed `lf config t <threshold>` to be 0 - 128 and will trigger on + or - threshold value (marshmellow) 
 +- `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to muliple pages for the larger tags yet)
  - Revised workflow for StandAloneMode14a (Craig Young)
  - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers)
  - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi)
diff --cc client/cmdhf.c
index b1e67005,caae08e5..e3671a42
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@@ -576,30 -688,22 +688,31 @@@ int CmdHFSearch(const char *Cmd)
  	return 0;
  }
  
 +int CmdHFSnoop(const char *Cmd)
 +{
 +	char * pEnd;
 +	UsbCommand c = {CMD_HF_SNIFFER, {strtol(Cmd, &pEnd,0),strtol(pEnd, &pEnd,0),0}};
 +	SendCommand(&c);
 +	return 0;
 +}
 +
  static command_t CommandTable[] = 
  {
-   {"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]"},
-   {"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
-   {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... }"},
+ 	{"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"},
+ 	{"search",	CmdHFSearch,	1, "Search for known HF tags [preliminary]"},
++	{"snoop",   CmdHFSnoop,     0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
+ 	{NULL,		NULL,			0, NULL}
  };
  
  int CmdHF(const char *Cmd)