Commit graph

74 commits

Author SHA1 Message Date
iceman1001 e3127f7440 fix: 'hf 14b raw -t' - a bit messed up 2019-03-15 02:05:15 +01:00
osboxes.org 9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001 1d63258388 add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125 2019-03-12 14:41:23 +01:00
iceman1001 35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 a49b3763dd fix: bad check 2019-02-24 19:50:05 +01:00
iceman1001 954e01c363 fix: bad loop 2019-02-21 23:38:07 +01:00
iceman1001 697af67bf1 fix: 'hf 14b info' - missing break 2019-02-21 23:37:18 +01:00
Chris 5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
Chris f62c231830 chg: missing tab 2018-06-23 06:33:48 +02:00
iceman1001 c41013d394 chg: printandlogex now deals with string which has inital newline char. 2018-04-27 11:22:30 +02:00
iceman1001 71ce6e07ee CHG: moved trace commands into its own category (from hf)
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
2018-03-18 18:00:41 +01:00
Brian Pow 668b44ba26 use PrintAndLogEx() instead of PrintAndLog() 2018-02-22 20:49:39 +08:00
Brian Pow 72ce7dc595 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
iceman1001 7c89a191ef textual 2018-02-04 16:58:48 +01:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001 f6b98acbf6 chg: turn off antenna when failed. 2018-01-25 18:02:49 +01:00
iceman1001 b578e55d17 chg: 'hf 14b snoop' renamed 'hf 14b sniff'...
In order to use one command for SNIFFING..   All snoop names will be renamed.
2018-01-06 21:12:28 +01:00
iceman1001 d89fb5ab39 chg: helptext 2017-11-05 18:33:10 +01:00
iceman1001 ee1612870c CHG: 'info' unified helptext.
ADD: 'hf 14a info'  - skeleton function
2017-10-30 12:17:32 +01:00
iceman1001 26f786bfe4 chg: removed some warnings in ubuntu17.04 2017-08-25 20:28:16 +02:00
iceman1001 f28da2da6e monster merge...
all those changes marshmellow did..  and more...
2017-07-30 09:17:48 +02:00
iceman1001 195102e9ae fixes 2017-07-14 21:22:03 +02:00
iceman1001 e8015142cd fix: TRUE/FALSE -> bools
fix: 'iclass'  filepath 255, to use FILE_PATH_SIZE
fix: unified params test
2017-07-14 20:54:11 +02:00
iceman1001 86db8973b0 CHG; still looking at 14b, this time started to look at the tracelog times not working. 2016-08-09 23:13:18 +02:00
iceman1001 16658b1ff1 CHG: moved some TEA crypto stuff from 14b into analyse. 2016-08-07 21:08:17 +02:00
iceman1001 dccddaef77 CHG: "hf 14b sim" - Added the possibility to call it with a PUPI/UID. Sample: "hf 14b sim u 11223344" 2016-04-27 11:21:29 +02:00
iceman1001 a420e5c163 chg; no more crash when getting partial usb packages. 2016-04-25 23:15:12 +02:00
iceman1001 18b90cce48 CHG: this fixes an annoying fault of not running CONNECT in raw command... 2016-04-24 21:44:19 +02:00
iceman1001 186ad6037c ADD: added the ETU and Frame wait time based on the Frame wait integer value. 2016-03-23 14:02:50 +01:00
iceman1001 5de71ee6bf CHG: enter a define for TIMEOUT 2016-03-21 22:07:23 +01:00
iceman1001 6fc68747f6 ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side.
I also made the SRi read functions better by combining them.   The demodulation / uart code should be the same as last summers changes.  The device side code can now be even smaller.
2016-03-20 19:33:07 +01:00
iceman1001 1f3d5401a6 FIX: adding a silent mode for Topaz detection.
FIX: adding a silent mode for 14B detection.
2016-03-06 13:21:42 +01:00
iceman1001 3607b5a96a ADD: Added the autodetection of Topaz to "HF SEARCH"
FIX:  Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
2016-03-06 12:40:04 +01:00
iceman1001 ff3e074478 CHG: some minor changes to the 14b, the read 14b lua, 2016-03-01 07:03:00 +01:00
iceman1001 e994394a40 FIX: Coverity, Identical code for different branches, CID #121315, added a message and different return value. 2016-01-12 22:37:35 +01:00
iceman1001 341fd1debc FIX: removed printBits reference. 2015-12-23 11:59:34 +01:00
iceman1001 5636ee8ce6 ADD: 'hf mfu info' now prints following settings:
NFC_COUNTER_EN       - If set, every read,fast_read increases a counter.
      NFC_COUNTER_PROT_PWD - If set, reading nfc_counter needs a successfull pwd authentication before
These new settings is only valid for NTAG213/215/216,
2015-11-22 18:13:26 +01:00
iceman1001 e98572a1e2 I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work*
Things like the ICLASS, tryDecryptWord,

--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation,  start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written,  which has a lousy input check..
2015-10-07 23:00:46 +02:00
iceman1001 5de79e20f1 MOD:: reverse back changes to 14443b.c
ADD: the hid-flasher/usb_cmd.h  wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua  14443v crc inside LUA.
ADD: utils.lua  ConvertAsciiToHex method and minor adjustments checks.
2015-07-28 21:33:09 +02:00
iceman1001 14e1862537 REM: removed a comment
ADD: added the ISO14443b command to commands.lua
2015-07-24 16:45:52 +02:00
iceman1001 d8af608f8e TEST: Moebius two noce mfkey32... 2015-07-13 23:06:49 +02:00
iceman1001 b10a759fef @PM3 master merges, Piwi fix for mfnested
@Marshmellow42 's fix for FDB
2015-07-12 22:58:16 +02:00
iceman1001 6de14cec0e CHG: some minor changes in the ouput from hf 14b raw.
ADD: @marshmello42 's textual change in LF.
2015-06-29 22:37:55 +02:00
iceman1001 17ad0e0948 ADD: @marshmellow42 's 14b fixes.
FIX: 14b sim changes in  iso14443b.c ,  *experimental*   I took some timing loops from "14a sim" armsrc/iso14443a.c  and merged it into the "14b sim".   Now using two pm3's I can have one simulating and the other reading and it works.  Ask @pwpiwi if you want to know more of what those timing loops does.  Something about waiting for the fpga delay queue...
2015-06-25 12:25:44 +02:00
iceman1001 f53020e729 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
2015-06-23 23:02:29 +02:00