Commit graph

845 commits

Author SHA1 Message Date
iceman1001 79bf1ad2cc ADD: Jonor's timeout patch for "Hf 14a raw".
minor code clean up
2015-01-07 23:23:17 +01:00
iceman1001 b5be31f996 FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
ADD: crc32.c functionality
2015-01-07 22:56:20 +01:00
iceman1001 024b97c507 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	client/cmdhf.c
2015-01-07 22:55:26 +01:00
iceman1001 b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K"
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +01:00
iceman1001 d91a31f935 CHG: minor code clean up.
ADD: tunesamples in cmddata.c  pullrequest #33,  was removed by Marshmellows other commits. I returned it.
2015-01-07 21:29:38 +01:00
Martin Holst Swende 4df54240c1 Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541 2015-01-07 21:14:32 +01:00
iceman1001 52ab55ab0d ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
ADD: added a manufacturer list in "hf 14a reader",  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
2015-01-07 21:06:15 +01:00
iceman1001 79544b28ad CHG: minor code clean up
ADD: added some  helper-functions in util.c
2015-01-07 20:52:03 +01:00
iceman1001 3af373f352 CHG: Added support for tnp3xx in lua scripts.
ADD: a save file function in lua.
2015-01-07 20:45:43 +01:00
iceman1001 23b598ee23 CHG: Minor code clean up.
ADD: crc16.c - new crc16_ccitt calc.
2015-01-07 20:40:22 +01:00
iceman1001 002c1ce57a CHG: removed leftover debugging statements proxmark3.c
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
2015-01-07 11:10:46 +01:00
iceman1001 4888b28195 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-07 11:09:05 +01:00
Martin Holst Swende cb29e00a12 Save iclass dumps to file, like mifare-dump functionality works 2015-01-07 09:57:18 +01:00
iceman1001 9484ff3d6e ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.
2015-01-06 21:20:41 +01:00
iceman1001 bf8328e928 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-06 20:51:11 +01:00
Martin Holst Swende d2197f967a Changed io threshold to 140, fixed boolean error in comparison 2015-01-06 18:59:59 +01:00
Martin Holst Swende e47e52a2c8 Fixed thresholding of io fskdemod 2015-01-06 18:43:37 +01:00
iceman1001 3fe4ff4f03 CHG: generic code clean up. Removal of commented code.
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
Martin Holst Swende 6f101995b6 Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests 2015-01-05 09:16:06 +01:00
Martin Holst Swende 39d3ce5dd6 Moved iclass crc to be based on a lookup table 2015-01-04 22:10:25 +01:00
Martin Holst Swende 337818f7ab Minor dox 2015-01-04 21:26:10 +01:00
Martin Holst Swende 4c3de57ad2 Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands 2015-01-04 21:22:54 +01:00
Martin Holst Swende c8dd9b092e Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle 2015-01-04 14:53:26 +01:00
Martin Holst Swende 2e9d4b3ff4 Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed 2015-01-03 15:11:48 +01:00
Martin Holst Swende d0d1e24590 Set lower threshold for lf iodemod, it had too high threshold for filtering out noise. Now it works better at least with my antenna/setup 2015-01-03 14:36:38 +01:00
Martin Holst Swende 3400a4358d Fixed indentation 2015-01-03 14:29:22 +01:00
Martin Holst Swende 854b9a233f Removed unused variable 2015-01-03 14:29:07 +01:00
Martin Holst Swende ae8e8a4372 Corrected indentation to tabs only 2015-01-03 14:21:07 +01:00
Martin Holst Swende 6ca4c6463e Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops 2015-01-03 14:17:59 +01:00
Martin Holst Swende 45dda9fcd7 Merge pull request #34 from marshmellow42/master
Fsk demod fixes and additions to client for offline demoding
2015-01-01 13:46:48 +01:00
marshmellow42 7eefddcc58 Revert "problems creating pull request with the new traces"
This reverts commit e33b652c53.
2014-12-31 15:24:37 -05:00
marshmellow42 e33b652c53 problems creating pull request with the new traces
will add these traces later
2014-12-31 15:16:02 -05:00
marshmellow42 ac914e56db minor adjustment to askmandemod for lf search
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42 9ec1416ad2 added data rtrim command
enter location to trim all samples after
2014-12-31 14:43:49 -05:00
marshmellow42 f822a063b3 lf demod code cleanup - added fskraw arguments
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
2014-12-31 02:27:30 -05:00
marshmellow42 d5a72d2fee LF demod/cmd code cleanup + new lf search
cleaned up and error proof code.  plus added new command    lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards.  when offline it will test current
graphbuffer.
2014-12-30 16:08:33 -05:00
marshmellow42 6bfa18eab4 Merge pull request #1 from Proxmark/master
Test
2014-12-29 16:14:23 -05:00
marshmellow42 2df8c07907 minor setting adjustments/cleanup
clean up code
2014-12-29 15:58:59 -05:00
marshmellow42 66707a3b3c LF Demod bug fixes and add lf em em410xdemod
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
2014-12-29 15:32:53 -05:00
marshmellow42 7db5f1ca25 slight adjustment to include
removed extra unneeded path
2014-12-28 21:29:33 -05:00
marshmellow42 eb191de615 LF Demod streamlining
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
2014-12-28 20:33:32 -05:00
marshmellow42 9e6dd4eb69 rename askrawdemod to askmandemod 2014-12-24 13:01:09 -05:00
marshmellow42 0e74c023bd Created new detectclock function + EM decode addons
new detectclock is somewhat more reliable for ASK modulated tags.  added
this detect to askrawdemod if no clock in passed as an argument.  also
added more EM ID formats to output
2014-12-24 11:48:41 -05:00
marshmellow42 cd48c19c31 minor askrawdemod adjustment if errors in demoding are found
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
2014-12-23 15:16:53 -05:00
marshmellow42 2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd
added EM410x format check and print to the data askrawdemod command.  if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
2014-12-23 12:00:13 -05:00
pwpiwi 4be9e7507b Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-12-23 11:44:41 +01:00
pwpiwi a088364e9c Merge branch 'master' of https://github.com/pwpiwi/proxmark3 2014-12-23 11:26:10 +01:00
pwpiwi 52bfb95543 bugfixes in iso14443a.c and hf 14a reader
- introduced with the big frame and parity support (commit 6a1f2d82): tag responses with len%8 == 0 were dropped  - thanks iceman for testing and finding
- after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix.
2014-12-23 11:21:42 +01:00
pwpiwi 7705bf4e37 fixed a bug in iso14443a.c which had been introduced with the big frame and parity support (commit 6a1f2d82) - thanks iceman for finding and testing 2014-12-23 11:11:52 +01:00
marshmellow42 ea7d657f75 minor fix - got too comment happy removing test code
should not have commented this code out
2014-12-22 22:50:13 -05:00