DeforaNetworks/proxmark3
3
0
Fork 0
Code Releases Activity

Commit Graph

  • f164662363 Merge branch 'master' of https://github.com/iceman1001/ForPm3 Martin Holst Swende 2015-01-15 21:50:03 +01:00
  • d60418a05f Synchronized loclass library, imported the legal warning Martin Holst Swende 2015-01-15 16:28:28 +01:00
  • 758f1fd1f3 Fixed issue #43 on github Martin Holst Swende 2015-01-15 16:07:58 +01:00
  • 6b038d192a Minor dox Martin Holst Swende 2015-01-15 15:45:54 +01:00
  • 1eb874ee3f Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-01-15 15:45:15 +01:00
  • 09b69422e2 This was resynthezised along with my hf-changes. Nothing changed though Martin Holst Swende 2015-01-15 15:29:03 +01:00
  • 7b941c8d7f Fixed memory corruption after reader-attack in armsrc, fixed annoying LED Martin Holst Swende 2015-01-15 15:27:44 +01:00
  • 645c960f61 Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages Martin Holst Swende 2015-01-15 15:16:34 +01:00
  • dc065b4e34 slight em410xdecode adjustments marshmellow42 2015-01-13 17:52:48 -05:00
  • 84871873a4 Small lf bug fixes and threshold adjustments marshmellow42 2015-01-13 17:21:36 -05:00
  • a631936e84 ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC. ADD: des.c , aes.c in ARMSRC iceman1001 2015-01-13 23:18:04 +01:00
  • ae6ead3dc8 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-01-13 16:02:23 -05:00
  • 4e3d8d0f76 Merge pull request #40 from holiman/master Martin Holst Swende 2015-01-13 19:40:41 +01:00
  • 896473399b Actually add the FILES also, doh Martin Holst Swende 2015-01-12 22:16:46 +01:00
  • 55eaed8f2a Documentation to apps.h, documentation/renaming to iclass Martin Holst Swende 2015-01-12 22:08:57 +01:00
  • 1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead Martin Holst Swende 2015-01-12 21:47:36 +01:00
  • 68033ed776 Fixed error when no match is found for uidmapping Martin Holst Swende 2015-01-11 21:49:13 +01:00
  • ac3ba7ee69 lf search use new psk, small demod adjustments marshmellow42 2015-01-09 16:46:17 -05:00
  • 473124be92 removed double include Martin Holst Swende 2015-01-09 21:51:34 +01:00
  • f44a01235c Merge branch 'master' of https://github.com/iceman1001/ForPm3 Martin Holst Swende 2015-01-09 21:50:36 +01:00
  • 952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-08 22:23:45 +01:00
  • 07c808038c Merge pull request #38 from marshmellow42/master Martin Holst Swende 2015-01-08 21:53:20 +01:00
  • 31d1caa526 Reverted some minor things, altered other things to get it to compile cleanly Martin Holst Swende 2015-01-08 17:51:52 +01:00
  • 03d7b60f2b ADD: default_toys.lua a script which identify tnp3xx tags iceman1001 2015-01-08 17:36:01 +01:00
  • c12512e99a minor code cleanup marshmellow42 2015-01-07 23:02:00 -05:00
  • d6d20c5435 cmddata.c changes by others - reapply marshmellow42 2015-01-07 19:06:29 -05:00
  • 3179383f85 put cmdlf.c back (only changes spaces to tabs) marshmellow42 2015-01-07 18:45:47 -05:00
  • 8e863ab641 FIX: forgot to add the function in the header file. iceman1001 2015-01-08 00:20:22 +01:00
  • c3bfb9c76b ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it. minor code clean up. iceman1001 2015-01-08 00:17:40 +01:00
  • bce5d24494 Merge branch 'master' of https://github.com/marshmellow42/proxmark3 marshmellow42 2015-01-07 18:15:14 -05:00
  • 3aa4014baa Fix Tune Samples (broken in commit 12/31 by me) marshmellow42 2015-01-07 16:34:02 -05:00
  • ba1a299ce6 code cleanup. re-added psk commands. marshmellow42 2015-01-06 23:29:45 -05:00
  • c07b79fcbf sync with master lf files to resolve conflicts marshmellow42 2015-01-06 10:58:35 -05:00
  • 4118b74dc8 added data psk* cmds for pskdemod marshmellow42 2015-01-06 09:20:36 -05:00
  • 787b5bd8a4 CHG: minor code clean up in ArmSrc. ADD: added some more default keys in Hf mf nested, maybe it runs faster :) iceman1001 2015-01-08 00:08:33 +01:00
  • 79bf1ad2cc ADD: Jonor's timeout patch for "Hf 14a raw". minor code clean up iceman1001 2015-01-07 23:23:17 +01:00
  • b5be31f996 FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. ADD: crc32.c functionality iceman1001 2015-01-07 22:56:20 +01:00
  • 024b97c507 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-07 22:55:26 +01:00
  • 809fb6aeab Fix Tune Samples (broken in commit 12/31 by me) marshmellow42 2015-01-07 16:34:02 -05:00
  • 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 iceman1001 2015-01-07 22:00:29 +01:00
  • d91a31f935 CHG: minor code clean up. iceman1001 2015-01-07 21:29:38 +01:00
  • 4df54240c1 Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541 Martin Holst Swende 2015-01-07 21:14:32 +01:00
  • 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. iceman1001 2015-01-07 21:06:15 +01:00
  • 79544b28ad CHG: minor code clean up ADD: added some helper-functions in util.c iceman1001 2015-01-07 20:52:03 +01:00
  • 3af373f352 CHG: Added support for tnp3xx in lua scripts. ADD: a save file function in lua. iceman1001 2015-01-07 20:45:43 +01:00
  • 23b598ee23 CHG: Minor code clean up. ADD: crc16.c - new crc16_ccitt calc. iceman1001 2015-01-07 20:40:22 +01:00
  • 002c1ce57a CHG: removed leftover debugging statements proxmark3.c CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS. iceman1001 2015-01-07 11:10:46 +01:00
  • 4888b28195 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-07 11:09:05 +01:00
  • cb29e00a12 Save iclass dumps to file, like mifare-dump functionality works Martin Holst Swende 2015-01-07 09:57:18 +01:00
  • a6293168da code cleanup. re-added psk commands. marshmellow42 2015-01-06 23:29:45 -05:00
  • 9484ff3d6e ADD: tnp3xxx identification in luascripts. CHG: minor code clean up. iceman1001 2015-01-06 21:20:41 +01:00
  • bf8328e928 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-06 20:51:11 +01:00
  • 9269081341 Merge pull request #4 from Proxmark/master marshmellow42 2015-01-06 14:28:59 -05:00
  • d2197f967a Changed io threshold to 140, fixed boolean error in comparison Martin Holst Swende 2015-01-06 18:59:59 +01:00
  • e47e52a2c8 Fixed thresholding of io fskdemod Martin Holst Swende 2015-01-06 18:43:37 +01:00
  • 389d0360e1 Merge pull request #3 from Proxmark/master marshmellow42 2015-01-06 11:02:11 -05:00
  • 1c4b102cd5 sync with master lf files to resolve conflicts marshmellow42 2015-01-06 10:58:35 -05:00
  • 5644791bdb added data psk* cmds for pskdemod marshmellow42 2015-01-06 09:20:36 -05:00
  • 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. iceman1001 2015-01-05 15:51:27 +01:00
  • 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 Martin Holst Swende 2015-01-05 09:16:06 +01:00
  • 39d3ce5dd6 Moved iclass crc to be based on a lookup table Martin Holst Swende 2015-01-04 22:10:25 +01:00
  • 337818f7ab Minor dox Martin Holst Swende 2015-01-04 21:26:10 +01:00
  • 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 Martin Holst Swende 2015-01-04 21:22:54 +01:00
  • 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 Martin Holst Swende 2015-01-04 14:53:26 +01:00
  • 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 Martin Holst Swende 2015-01-03 15:11:48 +01:00
  • 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 Martin Holst Swende 2015-01-03 14:36:38 +01:00
  • 3400a4358d Fixed indentation Martin Holst Swende 2015-01-03 14:29:22 +01:00
  • 854b9a233f Removed unused variable Martin Holst Swende 2015-01-03 14:29:07 +01:00
  • ae8e8a4372 Corrected indentation to tabs only Martin Holst Swende 2015-01-03 14:21:07 +01:00
  • 6ca4c6463e Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops Martin Holst Swende 2015-01-03 14:16:05 +01:00
  • 45dda9fcd7 Merge pull request #34 from marshmellow42/master Martin Holst Swende 2015-01-01 13:46:48 +01:00
  • 7eefddcc58 Revert "problems creating pull request with the new traces" marshmellow42 2014-12-31 15:24:37 -05:00
  • e33b652c53 problems creating pull request with the new traces marshmellow42 2014-12-31 15:16:02 -05:00
  • ac914e56db minor adjustment to askmandemod for lf search marshmellow42 2014-12-31 14:55:58 -05:00
  • 9ec1416ad2 added data rtrim command marshmellow42 2014-12-31 14:43:49 -05:00
  • f822a063b3 lf demod code cleanup - added fskraw arguments marshmellow42 2014-12-31 02:27:30 -05:00
  • d5a72d2fee LF demod/cmd code cleanup + new lf search marshmellow42 2014-12-30 16:08:33 -05:00
  • 6bfa18eab4 Merge pull request #1 from Proxmark/master marshmellow42 2014-12-29 16:14:23 -05:00
  • 2df8c07907 minor setting adjustments/cleanup marshmellow42 2014-12-29 15:58:59 -05:00
  • 66707a3b3c LF Demod bug fixes and add lf em em410xdemod marshmellow42 2014-12-29 15:32:53 -05:00
  • 7db5f1ca25 slight adjustment to include marshmellow42 2014-12-28 21:29:33 -05:00
  • eb191de615 LF Demod streamlining marshmellow42 2014-12-28 20:33:32 -05:00
  • 9e6dd4eb69 rename askrawdemod to askmandemod marshmellow42 2014-12-24 13:01:09 -05:00
  • 0e74c023bd Created new detectclock function + EM decode addons marshmellow42 2014-12-24 11:48:41 -05:00
  • cd48c19c31 minor askrawdemod adjustment if errors in demoding are found marshmellow42 2014-12-23 15:16:53 -05:00
  • 2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd marshmellow42 2014-12-23 12:00:13 -05:00
  • 4be9e7507b Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-23 11:44:41 +01:00
  • a088364e9c Merge branch 'master' of https://github.com/pwpiwi/proxmark3 pwpiwi 2014-12-23 11:26:10 +01:00
  • 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. pwpiwi 2014-12-23 11:11:52 +01:00
  • 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 pwpiwi 2014-12-23 11:11:52 +01:00
  • ea7d657f75 minor fix - got too comment happy removing test code marshmellow42 2014-12-22 22:50:13 -05:00
  • e888ed8e62 added new data askrawdemod command marshmellow42 2014-12-22 17:46:28 -05:00
  • e688629475 Merge pull request #33 from pwpiwi/master pwpiwi 2014-12-20 21:56:12 +01:00
  • 545f203826 adapted hf iclass list to new trace format pwpiwi 2014-12-20 18:46:13 +01:00
  • ae2f73c12d put ask demod and mandemod marshmellow42 2014-12-19 12:39:41 -05:00
  • b3b706693b Final touches on IO prox and HID prox demod marshmellow42 2014-12-19 12:14:27 -05:00
  • db4de4d82f Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-18 19:42:49 +01:00
  • 57642f63fa bugfixes hf epa cnonces - extended length (more than 1 byte) not handled correctly - nonces not printed on Windows due to type mismatch pwpiwi 2014-12-18 19:40:35 +01:00
  • f10bf20c6c Format hf 14a list output for bigger frame sizes pwpiwi 2014-12-18 19:39:16 +01:00
  • 8e9768399c minor change Martin Holst Swende 2014-12-18 14:46:38 +01:00