Commit graph

9379 commits

Author SHA1 Message Date
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 c0e6c18bf5 FIX: more minor issues with block Numbers.
KNOWN BUG: Right now, it kind of defaults to Block 0 when a getparam8 failes. (like  writing "hf mfu rdbl k",  ie a letter instead of number). This bug is the same all over the pm3 source-code.
2015-01-07 19:01:00 +01:00
iceman1001 5f2cb31bca CHG: spelling errors, added help texts in cmdhfmfu.c
CHG: refactored the "hf mfu rdbl/wrbl/crdbl/wrbl" commands.
CHG: added a cauth test to "hf mfu info" command to see if the tag is a Ultralight-C tag or not.
2015-01-07 18:50:51 +01:00
iceman1001 225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
2015-01-07 17:42:57 +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
marshmellow42 a6293168da code cleanup. re-added psk commands.
also fixed a bug in detect clock functions.
sync with master prep for pull request
2015-01-06 23:29:45 -05:00
iceman1001 9484ff3d6e ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.
2015-01-06 21:20:41 +01:00
iceman1001 99a714185e CHG: Refactored the HF MFU udump/ucdump commands into one method. 2015-01-06 21:08:20 +01:00
iceman1001 bf8328e928 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-06 20:51:11 +01:00
marshmellow42 9269081341 Merge pull request #4 from Proxmark/master
resync fork to master
2015-01-06 14:28:59 -05: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 e3ab50cafb CHG: rename the HF MFU * commands.
ADD: added a HF MFU INFO  commmand, where you can see some tag info. Used to be in the readcard command.
FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c
CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR.
CHG: lowered a testing value for timeout in cmdhf14a.c
2015-01-06 17:43:31 +01:00
marshmellow42 389d0360e1 Merge pull request #3 from Proxmark/master
re sync with masterB
2015-01-06 11:02:11 -05:00
marshmellow42 1c4b102cd5 sync with master lf files to resolve conflicts 2015-01-06 10:58:35 -05:00
iceman1001 dd683ece72 FIX: a compilation error for a static method in CmdHF14A.h 2015-01-06 15:36:33 +01:00
marshmellow42 5644791bdb added data psk* cmds for pskdemod
fixed a couple small bugs in other lf functions as well including
detectaskclock,  stopped changes from being made to graphbuffer.
2015-01-06 09:20:36 -05:00
iceman1001 10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
2015-01-06 11:17:02 +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
iceman1001 0452ec6c90 FIX: downloaded a fresh clone from my fork, and took away the build-errors. 2015-01-05 15:12:48 +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
iceman1001 d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001 f0cf62cd73 FIX: fixed a little bug I introduced from last commit in fskdemod
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
2015-01-04 23:43:07 +01:00
iceman1001 8d0a3e87d7 FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.

The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read  now does a "data samples" also.  (less writing commands)
CHG: data samples now defaults to samples size of 20000
2015-01-04 22:49:54 +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
iceman1001 b1329a0264 chg: updated the README.txt
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
2015-01-02 00:09:59 +01:00
Iceman 7c5f70dd9f Merge pull request #1 from bforbort/master
Added DES AUTH command support
2015-01-01 23:02:23 +01:00
Blaine Forbort 23b80a7334 Merge remote-tracking branch 'origin/DESFireAuth' 2015-01-01 10:41:14 -08:00
iceman1001 0a966150a0 Updated the README.txt
CHG:  added marshmellows last changes with rtrim, and minor fixes.
DEL:  code cleanup in usb_cdc.c
2015-01-01 14:07:42 +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
iceman1001 c579a5871e CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded. 2014-12-31 12:01:00 +01:00
iceman1001 6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch.
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
2014-12-31 11:35:43 +01:00