Commit Graph

  • 0eea34a2a3 Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data Martin Holst Swende 2014-12-18 14:41:17 +01:00
  • 7496d8d822 Merge pull request #32 from marshmellow42/master Martin Holst Swende 2014-12-18 08:56:26 +01:00
  • 2bdd68c370 unify/refactor hw tune and data tune - unified hw tune and Enio's great data tune - don't use BigBuf (and hardcoded Offset) - removed special handling of CMD_MEASURED_ANTENNA_TUNING in UsbCommandReceived() pwpiwi 2014-12-17 17:38:13 +01:00
  • 083ca3de73 LF HID & IO prox fixes/options marshmellow42 2014-12-17 09:51:40 -05:00
  • 471c514167 Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-16 07:47:02 +01:00
  • 6a1f2d82bb bugfixes iso14443a (hf 14a commands) - buffers were too small to handle 256 byte frames - parity bits were only handled for up to 32 byte frames - trace format was inefficient - removed parity calculation from decoders in iclass.c (parity not used on air anyway) pwpiwi 2014-12-16 07:41:07 +01:00
  • 6116c79618 Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0 Martin Holst Swende 2014-12-14 21:37:56 +01:00
  • b160432340 Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2014-12-14 18:07:38 +01:00
  • eabba3df7e Fix (iclass) Martin Holst Swende 2014-12-14 18:07:12 +01:00
  • 4860172789 LF HID & IO prox demod translation addons marshmellow42 2014-12-13 20:23:59 -05:00
  • f4bad97d92 Merge pull request #31 from dnet/patch-1 ikarus 2014-12-10 19:10:12 +01:00
  • 0ff9a93966 Typofix: occurrences András Veres-Szentkirályi 2014-12-10 16:42:31 +01:00
  • d6a120a25b Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060 Martin Holst Swende 2014-11-30 22:30:36 +01:00
  • 8720c8f5d7 Increased Mifare Esave & Eload filename array to 255 from 20 unstable midnitesnake 2014-11-15 22:01:59 +00:00
  • c936a22f19 Removed dupicate symbols midnitesnake 2014-11-09 11:40:22 +00:00
  • 8b70b6e7c2 forgot one edit within the client for ultralight C and desfire midnitesnake 2014-11-09 11:37:07 +00:00
  • 16a372ab75 Added the changes to armsrc for milfare ultralight C and Desfire commands midnitesnake 2014-11-09 11:30:29 +00:00
  • a88dc6ab3b Added some previous work of splitting ultralight to its own c-file, ported Pentura_Prox's initial PoC for ultralight C and Desfire Cards. Needs more work but hopefully we can finish this. midnitesnake 2014-11-09 10:57:51 +00:00
  • ca4714cd23 More coverity fixes Martin Holst Swende 2014-10-30 21:49:18 +01:00
  • 0ce5620254 Merge pull request #23 from holiman/master Martin Holst Swende 2014-10-30 20:08:29 +01:00
  • 4c6f2d48fb Merge pull request #2 from holiman/coverity_fixes Martin Holst Swende 2014-10-28 21:46:28 +01:00
  • 2ed270a854 Coverity-fixes in armsrc Martin Holst Swende 2014-10-28 21:44:17 +01:00
  • 97d582a692 More coverity findings Martin Holst Swende 2014-10-27 22:33:37 +01:00
  • 90e278d3da Fixed several issues found using a coverity-scan Martin Holst Swende 2014-10-27 21:46:04 +01:00
  • 77dfaa26db Merge pull request #1 from holiman/ioprox_fixes Martin Holst Swende 2014-10-27 19:13:30 +01:00
  • 9cc8a1e588 Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now Martin Holst Swende 2014-10-25 22:42:27 +02:00
  • b225678574 Some minor changes and some documentation Martin Holst Swende 2014-10-24 21:12:31 +02:00
  • 1a5a0d7590 Fixed compilation issues, but functionality not tested Martin Holst Swende 2014-10-24 20:53:43 +02:00
  • f97d4e2378 First try att merging with head Martin Holst Swende 2014-10-24 20:46:02 +02:00
  • 92d255d3dc Merge pull request #22 from Proxmark/PenturaLabs-iclass-research Martin Holst Swende 2014-09-19 09:50:56 +02:00
  • e6ee6c4cd1 Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research Martin Holst Swende 2014-09-19 09:45:38 +02:00
  • c626c56ef5 hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition pwpiwi 2014-09-12 07:45:04 +02:00
  • 79db03ef63 hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file - hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case. - hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin). if there are unknown keys, write 0xffffffffffff instead to the file. - provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from mf_default_keys.lua pwpiwi 2014-09-11 20:58:34 +02:00
  • baeaf57950 fix/add support for 4K (and other non 1K) card sizes in hf mf commands - hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39 - hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards - hf mf dump (add): added (optional) card size parameter and support for non 1K cards - hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A) - hf mf restore (add): added (optional) card size parameter and support for non 1K cards - hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39 - hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number - hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number - hf mf eget (fix): displayed three instead of one block - hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility) - hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only - hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards pwpiwi 2014-09-10 19:04:50 +02:00
  • fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys Martin Holst Swende 2014-08-29 09:11:36 +02:00
  • 5b1311fba2 Various scripts from iceman Martin Holst Swende 2014-08-29 09:09:23 +02:00
  • 6e2f51a06e add *.eml to .gitignore pwpiwi 2014-08-05 18:45:37 +02:00
  • bfb6a143ea bugfix hf mf sim - an additional erronous byte was sent after SAK pwpiwi 2014-08-05 18:40:19 +02:00
  • b03c0f2d86 bugfixes hf mf sim - output of debug messages caused communication failures due to timing issues. hf mf dbg 4 now required to see these debug messages. - changed help text for hf mf dbg - fixed minor bugs in help texts for hf mf sim and hf mf ecset - display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim pwpiwi 2014-07-30 21:23:02 +02:00
  • c3c18b0632 hack to add missing directory structure for loclass binaries midnitesnake 2014-07-26 10:01:42 +01:00
  • f028213f0e Unstable branch: ported iclass research from Pentura_Prox's previous proxmark implentation. midnitesnake 2014-07-17 11:09:30 +01:00
  • 2e656c39eb Unstable Branch: commited minor improvments to io fskdemod midnitesnake 2014-07-17 09:38:08 +01:00
  • 991f13f27d minor bugfixes to hf mf sniff and hf 14a snoop - tracing was not always enabled when starting hf mf sniff or hf 14a snoop - ATQA was displayed in wrong byte order in hf mf sniff - 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff - same for logfile names. - assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though) pwpiwi 2014-07-15 08:39:56 +02:00
  • 9a573554e0 minor bugfix and enhancement to hf 14a reader - "SAK incorrectly claims ... " message was displayed incorrectly - now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp. pwpiwi 2014-07-15 08:35:27 +02:00
  • c7324bef28 Bugfix hf 14a raw: number of bits sent was wrong when option -c was used without option -b pwpiwi 2014-07-01 08:28:28 +02:00
  • 1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-07-01 07:09:21 +02:00
  • 9e28ee9f14 Only documentation and minor changes Martin Holst Swende 2014-06-30 11:23:14 +02:00
  • 19d6d91fd5 hf 14a reader enhancement pwpiwi 2014-06-30 08:21:50 +02:00
  • 9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( Martin Holst Swende 2014-06-30 00:20:40 +02:00
  • aa41c6058a Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo Martin Holst Swende 2014-06-29 23:34:24 +02:00
  • d2d0af8ca6 Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research Martin Holst Swende 2014-06-29 13:52:05 +02:00
  • dbf732ee41 Minor Martin Holst Swende 2014-06-29 13:48:13 +02:00
  • 74a3880283 Changes inorder for iclass dump to work correctly Midnitesnake 2014-06-29 09:25:31 +01:00
  • 26c0d833ac Some minor changes [iclass-related] Martin Holst Swende 2014-06-28 22:57:48 +02:00
  • 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research Martin Holst Swende 2014-06-28 20:52:37 +02:00
  • 6c0f60ca7b Merge pull request #17 from Proxmark/iclass-fixes Martin Holst Swende 2014-06-28 12:50:09 +02:00
  • 6db28145ea Merge remote-tracking branch 'origin/master' into iclass-fixes Martin Holst Swende 2014-06-28 12:47:40 +02:00
  • 238c503c38 fpga/min_max_tracker.v: english iZsh 2014-06-27 23:28:56 +02:00
  • 0dcf1ee3fd git housekeeping: - added *.log files to .gitignore - new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files pwpiwi 2014-06-27 19:23:42 +02:00
  • 3b2fee43ea New LF edge detection algorithm + lowpass filter iZsh 2014-06-22 00:26:38 +02:00
  • 42f57e0294 Merged with master Martin Holst Swende 2014-06-27 13:16:31 +02:00
  • 77abe781af fix for better csns Martin Holst Swende 2014-06-27 12:52:28 +02:00
  • c6b492aea1 Add images for wiki. gh-pages ikarus 2014-06-26 10:55:47 +02:00
  • e17437f985 Keep the PM3 code repo clean of website/wiki stuff. ikarus 2014-06-26 10:50:23 +02:00
  • 72b1090acf Bugfixes: - Byteorder was wrong when displaying ATQA in hf 14a read - 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids pwpiwi 2014-06-26 07:57:49 +02:00
  • b014c96d68 new command "lf snoop" to snoop raw ADC values iZsh 2014-06-21 21:33:54 +02:00
  • fa57f6e12e fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice iZsh 2014-06-20 12:38:58 +02:00
  • 62638f87db armsrc/fpgaloader.c: forgot the copyright notice iZsh 2014-06-20 12:29:58 +02:00
  • 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. iZsh 2014-06-20 01:02:59 +02:00
  • fecd8202a5 implemented 'hf iclass dump xxxx', all you need is the magic key to dump contents of an iclass card penturalabs 2014-06-17 10:55:37 +01:00
  • 9f6e9d1575 More work on iclass simulation attack Martin Holst Swende 2014-06-16 21:27:12 +02:00
  • d51b2eda8f Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577 Martin Holst Swende 2014-06-11 08:42:37 +02:00
  • fa541aca96 Minor changes, it may actually work now, need to test with a credentialed reader Martin Holst Swende 2014-06-07 22:16:57 +02:00
  • 94ad01bfba Merged with head Martin Holst Swende 2014-06-07 22:04:27 +02:00
  • 81012e670b debug in progress Martin Holst Swende 2014-06-07 22:00:31 +02:00
  • e3dc1e4cf5 Minor changes in iclass.c Martin Holst Swende 2014-06-07 21:49:56 +02:00
  • 94090295a7 new fpga image for better iso15693 simulation Martin Holst Swende 2014-06-07 21:44:45 +02:00
  • 83fd67ba0b Added mode for 424k modulation (iso 15693) Martin Holst Swende 2014-06-07 21:40:47 +02:00
  • 12401d8dbc Added 424KHz mode for iso 15693 simulation Martin Holst Swende 2014-06-07 21:39:52 +02:00
  • fe53c0311c improved calc_iclass_mac to work independant of size penturalabs 2014-05-02 23:30:03 +01:00
  • a66fca86b9 Updated proxmark research with Holiman's loclass framework Andrew Davies 2014-05-02 11:11:54 +01:00
  • fdcd43eb15 Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands Martin Holst Swende 2014-04-26 16:15:16 +02:00
  • f83cc12613 More work on iclass Martin Holst Swende 2014-04-24 15:48:00 +02:00
  • 17cba2693d Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping Martin Holst Swende 2014-04-24 14:13:33 +02:00
  • ff7bb4ef17 Experimenting with hacking iclass Martin Holst Swende 2014-04-17 09:53:54 +02:00
  • c3963755b7 Implement replay command. penturalabs 2014-04-15 11:47:01 +01:00
  • cba867f202 Final (?) fixes to git versioning https://github.com/Proxmark/proxmark3/issues/10 Martin Holst Swende 2014-04-04 20:14:58 +02:00
  • 7eb0f3d0ff Added lua, luac and proxmark3 (compieled binaries) to .gitignore. ikarus 2014-04-02 21:51:35 +02:00
  • 9c6837165b Updated nameing (svn -> git) & fixed whitespaces. ikarus 2014-04-02 21:46:25 +02:00
  • 23ca86b833 Changed size of version info Martin Holst Swende 2014-04-02 11:55:16 +02:00
  • e3ac0d7095 Fixed so build scripts utilises the git version Martin Holst Swende 2014-04-01 20:52:45 +02:00
  • 07976a256d Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch Martin Holst Swende 2014-03-31 17:57:14 +02:00
  • 69d88ec463 Major refactoring of lfops, removed a lot of duplicate code Martin Holst Swende 2014-03-30 15:59:54 +02:00
  • 046f3dfa7c Merge pull request #9 from doegox/addhelpm Martin Holst Swende 2014-03-28 12:27:38 +01:00
  • a2bea82d70 Revert "Update index.html" W8M2Hg9lLmWqXSGC 2014-03-28 11:03:53 +11:00
  • 3193a13003 Wiki W8M2Hg9lLmWqXSGC 2014-03-28 10:55:46 +11:00
  • 714b462183 Wiki W8M2Hg9lLmWqXSGC 2014-03-28 09:54:38 +11:00
  • 19e2a10de5 Markdown help: use fixed column width Philippe Teuwen 2014-03-27 16:49:37 +01:00
  • 46782176fc Restore original inline help behavior as we've now separate fcts for -h/-m Philippe Teuwen 2014-03-26 23:51:22 +01:00
  • dec8e8bd9f Provide option -m for markdown help dump, -h for text dump Philippe Teuwen 2014-03-26 23:35:53 +01:00