dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • f2d46122d3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-03-12 19:01:09 +01:00
  • aaa9f05e31 Merge pull request #77 from Proxmark/usb_check Martin Holst Swende 2015-03-12 18:15:08 +01:00
  • f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB Martin Holst Swende 2015-03-12 16:32:01 +01:00
  • 83a42ef965 FIX: move and rename the CRC8Maxim method into crc.c iceman1001 2015-03-12 14:12:14 +01:00
  • 3d83b58b50 ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c iceman1001 2015-03-12 10:10:22 +01:00
  • 5ff3c4017b add: a experimental lualib, unstable. fix: Introduced a wrong variable name due to "cut & paste" before, now fixed. iceman1001 2015-03-12 09:50:22 +01:00
  • 04a6113fb5 FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua ADD: added optional parameter (-p) to tnp3dump.lua iceman1001 2015-03-12 09:46:28 +01:00
  • 963fa1c2b8 FIX: minor correction of the command description for HF 14A RAW. iceman1001 2015-03-11 22:43:49 +01:00
  • 96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-03-11 22:21:01 +01:00
  • 3ee8c808c4 ADD: added a CRC64_ECMA implementation iceman1001 2015-03-11 22:06:23 +01:00
  • 04bc1c660b fix: hf 14a raw was broken (see http://www.proxmark.org/forum/viewtopic.php?id=2351) pwpiwi 2015-03-11 20:17:24 +01:00
  • 8c04722db6 (issue #47) use Qt5 includes and libraries, if present pwpiwi 2015-03-10 19:00:39 +01:00
  • 12d708fec1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-03-10 09:18:35 +01:00
  • 58e93ff593 Merge pull request #74 from marshmellow42/master Martin Holst Swende 2015-03-10 00:25:51 +01:00
  • 652c39c63b Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-03-09 22:03:24 +01:00
  • 1302428367 finish data printdemodbuffer command marshmellow42 2015-03-09 16:56:00 -04:00
  • 16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. pwpiwi 2015-03-09 21:36:27 +01:00
  • 5658e82e1e sim buffer max settings tests marshmellow42 2015-03-09 15:58:06 -04:00
  • ada339a10f biphase bug fixes marshmellow42 2015-03-09 15:27:20 -04:00
  • 30364d2711 fix: broken edge detector implementation in hi_iso14443a.v resulted in decreased sensitivity pwpiwi 2015-03-09 20:01:37 +01:00
  • d66d484347 fixed rawdemod help options marshmellow42 2015-03-08 18:07:01 -04:00
  • 712ebfa6df 1 bug fix + code trimming marshmellow42 2015-03-07 23:31:23 -05:00
  • df51693f95 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-06 12:30:16 -05:00
  • 78f5b1a77c lf sim fixes/creations correct now marshmellow42 2015-03-06 12:28:54 -05:00
  • e09f21fa7b Revert "lf sim fixes/creations" marshmellow42 2015-03-06 12:26:33 -05:00
  • 293de1bad7 lf sim fixes/creations marshmellow42 2015-03-06 12:25:36 -05:00
  • 3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-03-06 09:02:15 +01:00
  • 7843130a58 fix: (issue #72) LF simulation didn't work with lo_edge_detect.v pwpiwi 2015-03-06 07:39:34 +01:00
  • 9cefee6f42 Fixed issue #36 & improved file consistency. ikarus 2015-03-04 11:00:39 +01:00
  • 39676885b4 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-03 20:44:37 -05:00
  • 11081e0459 finish gProxII_Demod marshmellow42 2015-03-03 16:20:18 -05:00
  • c8387e85e3 iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands Martin Holst Swende 2015-03-02 21:30:22 +01:00
  • 27eabcdccb Added brackets around crc field in protocol listings Martin Holst Swende 2015-03-02 21:05:44 +01:00
  • 40b9bb85e6 oops... should this file should not have been there marshmellow42 2015-03-02 14:44:05 -05:00
  • 8d960002c8 lf cmds fix, add, show marshmellow42 2015-03-02 14:42:55 -05:00
  • e5cd4ee4b4 Tag MAC finally works! (Full sim not yet, though) Martin Holst Swende 2015-03-02 20:14:35 +01:00
  • 61fe90736b Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins Martin Holst Swende 2015-03-02 00:38:36 +01:00
  • 73da818743 lf simulation tests marshmellow42 2015-02-28 14:33:05 -05:00
  • c99dc845b1 Added the ciphers also.. doh Martin Holst Swende 2015-02-27 20:19:10 +01:00
  • 188b2dbec4 Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-02-26 20:35:54 +01:00
  • 10a8875c72 Implemented new optimized version of MAC-calculation for iclass Martin Holst Swende 2015-02-26 20:35:35 +01:00
  • ec9882b18c PSKDemod Bug Fix marshmellow42 2015-02-22 21:11:25 -05:00
  • 3f41e73c7f PSK demod adjustment marshmellow42 2015-02-22 20:09:58 -05:00
  • 3bc66a96fe added PSK2 to lf simpsk marshmellow42 2015-02-21 22:54:52 -05:00
  • 872e3d4d6f NEW lf simpsk marshmellow42 2015-02-21 21:36:02 -05:00
  • b4a2fcf676 Split output from nrz raw demod function marshmellow42 2015-02-21 18:37:15 -05:00
  • b19caaefc2 Fixed minor bugs in iclass fullsim, does not work yet though Martin Holst Swende 2015-02-21 20:47:40 +01:00
  • 4ac906d1c2 split output from rawdemod functions marshmellow42 2015-02-21 00:27:48 -05:00
  • 40148ab609 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-19 21:38:17 -05:00
  • abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" marshmellow42 2015-02-19 21:35:34 -05:00
  • e396001c47 Revert "lf simask, lf simfsk and bug fixes" marshmellow42 2015-02-19 21:22:05 -05:00
  • fb0c84c3df lf simask, lf simfsk and bug fixes marshmellow42 2015-02-19 21:21:11 -05:00
  • f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-19 11:32:11 +01:00
  • 0387cd3393 Merge pull request #68 from iceman1001/feature Martin Holst Swende 2015-02-19 10:51:10 +01:00
  • 181e6db6a9 Merge pull request #67 from marshmellow42/master Martin Holst Swende 2015-02-19 10:50:51 +01:00
  • 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing Martin Holst Swende 2015-02-19 10:48:33 +01:00
  • b67f7ec359 Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode Martin Holst Swende 2015-02-18 20:02:44 +01:00
  • 9a9bcea82b Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper Martin Holst Swende 2015-02-17 23:17:43 +01:00
  • 41524d8a39 Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem Martin Holst Swende 2015-02-17 22:07:40 +01:00
  • 0853ffa29c ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's iceman1001 2015-02-16 19:01:09 +01:00
  • 33315928fb CHG: added some more token-tags. iceman1001 2015-02-16 19:00:17 +01:00
  • 3a72fdf5b0 CHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed. iceman1001 2015-02-16 19:01:52 +01:00
  • 5b3811fc0e ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's iceman1001 2015-02-16 19:01:09 +01:00
  • bd8baee9df CHG: added some more token-tags. iceman1001 2015-02-16 19:00:17 +01:00
  • d716ca2fc1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-16 18:59:44 +01:00
  • 8db0534ed1 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-14 21:16:27 -05:00
  • cc2ea5ed82 Clean up Helps and command descriptions marshmellow42 2015-02-14 21:15:13 -05:00
  • e80aeb9695 Started iclass emulator support on device side. Not functional yet Martin Holst Swende 2015-02-14 21:30:26 +01:00
  • a4749080d9 Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side Martin Holst Swende 2015-02-14 21:18:39 +01:00
  • 534445139c Reformatted Martin Holst Swende 2015-02-14 21:17:08 +01:00
  • 7781a65656 Started work on 'hf iclass eload' - only client side so far, not yet supported in the device Martin Holst Swende 2015-02-14 21:15:53 +01:00
  • 428d622160 Fixed bug with iclass dump which prevented saving to file Martin Holst Swende 2015-02-14 20:42:23 +01:00
  • 0cd2a41ac0 Made 125KHz default sampling, instead of 134KHz for LF Martin Holst Swende 2015-02-14 19:55:23 +01:00
  • 6af88242eb Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-14 12:30:08 +01:00
  • 68008fb517 add: timeouts for "lf read" chg: change command consistency "lf t55xx rd" -> "lf t55xx read" chg: buffer size used for armside is quite big. maybe to big. takes too long to read. iceman1001 2015-02-14 12:29:02 +01:00
  • abd16c456a fix help on data rawdemod commands marshmellow42 2015-02-13 21:17:15 -05:00
  • 2e2fc9fa6b Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-02-13 19:59:50 +01:00
  • 699bb9dc27 Removed some dev- printouts Martin Holst Swende 2015-02-13 19:59:28 +01:00
  • b359cee677 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-13 10:16:39 +01:00
  • 4e7af352b4 chg: step two for t55xx commnads iceman1001 2015-02-13 10:16:21 +01:00
  • 17c60b1248 Merge pull request #63 from marshmellow42/master Martin Holst Swende 2015-02-13 10:11:40 +01:00
  • 37735250ca Merge pull request #66 from iceman1001/feature Martin Holst Swende 2015-02-13 10:11:09 +01:00
  • 31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-12 09:54:21 +01:00
  • 8b9393d3bd fixed issue #65 Martin Holst Swende 2015-02-12 08:21:58 +01:00
  • 19a700a8b5 hf 14a: if the tag supports it, set default timeout according to ATS hf epa: remove explicit but arbitrary timeout settings Bugfix: don't timeout when frame transmission has already started pwpiwi 2015-02-11 18:30:36 +01:00
  • 7554370c30 bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong pwpiwi 2015-02-11 21:14:34 +01:00
  • 070e36d421 ADD: identification of EM4233 iceman1001 2015-02-11 17:08:16 +01:00
  • 0310364d23 chg: the inital modification of t55xx commands to use Marshmellows new demod functions. fix: merged readblock & readblockPWD command. New syntax: "lf t55xx rd <block> <password>" -- OPTIONAL password iceman1001 2015-02-11 17:13:30 +01:00
  • 00a863f9ad ADD: identification of EM4233 iceman1001 2015-02-11 17:08:16 +01:00
  • 4ecde0e1ff Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 21:53:16 +01:00
  • 24cbeb3d27 Merge pull request #58 from Proxmark/GenericTracing Martin Holst Swende 2015-02-10 21:27:47 +01:00
  • 61972abbdd Merge branch 'master' into GenericTracing Martin Holst Swende 2015-02-10 21:25:14 +01:00
  • 1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 09:01:31 +01:00
  • 2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 08:58:14 +01:00
  • 92bf686817 Merge pull request #64 from jessegit/csetuidfix pwpiwi 2015-02-10 07:27:06 +01:00
  • 3bba7deac0 Add settable ATQA and SAK to hf mf csetuid command. Jesse Hallio 2015-02-10 04:31:53 +02:00
  • 7e72f90a7f Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-09 16:47:24 -05:00
  • 0d0d049967 hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected. pwpiwi 2015-02-09 08:53:39 +01:00
  • 19ff0210fa lf data combine rawdemods & depreciate cmds marshmellow42 2015-02-09 16:25:12 -05:00
  • 904a96cd80 Merge pull request #59 from marshmellow42/master Martin Holst Swende 2015-02-09 20:28:12 +01:00