Commit Graph

  • 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
  • b1329a0264 chg: updated the README.txt chg: updated the commands.lua so it is in sync with usb_cnd.c definitions. iceman1001 2015-01-02 00:09:59 +01:00
  • 7c5f70dd9f Merge pull request #1 from bforbort/master Iceman 2015-01-01 23:02:23 +01:00
  • 23b80a7334 Merge remote-tracking branch 'origin/DESFireAuth' Blaine Forbort 2015-01-01 10:41:14 -08:00
  • 0a966150a0 Updated the README.txt CHG: added marshmellows last changes with rtrim, and minor fixes. DEL: code cleanup in usb_cdc.c iceman1001 2015-01-01 14:07:42 +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
  • 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. iceman1001 2014-12-31 12:01:00 +01:00
  • 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 iceman1001 2014-12-31 11:35:43 +01: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
  • 9c7c222c03 FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO) iceman1001 2014-12-26 22:38:23 +01:00
  • d52e4e8819 ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands. FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't. iceman1001 2014-12-26 21:32:58 +01:00
  • 1b492a97af ADD: marshmellows new lf command and DetectClock. (works great!) FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35) FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set, this made desfire/magic cards not work. iceman1001 2014-12-26 20:02:59 +01: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
  • 3bc3598e88 added the changes from PM3 master. added some code for the AWID26 iceman1001 2014-12-22 15:14:05 +01:00
  • 082789c4df Using defined command code Blaine Forbort 2014-12-22 00:21:20 -08:00
  • 46e14b0f96 Minor formatting change Blaine Forbort 2014-12-21 23:54:29 -08:00
  • f56bd0174a Remove unrelated file Blaine Forbort 2014-12-21 23:41:15 -08:00
  • 4e2e4bcf9b Tested by changing the master key from the default to a custom value Blaine Forbort 2014-12-21 22:59:24 -08:00
  • 0673263230 code to check RndA' from PICC was unreachable Blaine Forbort 2014-12-20 19:25:31 -08:00
  • 6a1aa12df0 Called the OnSuccess() method for whatever reason that's there. Blaine Forbort 2014-12-20 19:15:48 -08:00
  • 3c05723ee2 Limit to single-DES operation and return session key to client. Blaine Forbort 2014-12-20 17:18:26 -08: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
  • 085b0e2ea9 Create session key Blaine Forbort 2014-12-20 00:10:59 -08:00
  • 6534821365 Accept key number from command line Blaine Forbort 2014-12-19 21:37:06 -08:00
  • a07a448220 Removed unneeded verbosity and checked for a 0x00 response from PICC after challenge response Blaine Forbort 2014-12-19 20:38:25 -08:00
  • 1051dee04a Challenge is now sent to PICC Blaine Forbort 2014-12-19 19:44:32 -08:00
  • 0127902ee6 Calculates response to PICC challenge Blaine Forbort 2014-12-19 19:36:19 -08:00
  • b6f41bfdfe Successfully decrypted RandB from PICC challenge Blaine Forbort 2014-12-19 12:15:45 -08:00
  • de9b66bc36 Added file demonstrating a singleDES AUTH operation using 'hf 14a raw' command Blaine Forbort 2014-12-19 12:15:04 -08:00
  • b216af9a24 Fixed build environment Blaine Forbort 2014-12-19 12:13:18 -08: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
  • f5ed4d12de ADD: started with adding a LF AWID26 write function. not done yet. ADD: latest pwpiwi & holiman changes. iceman1001 2014-12-19 13:46:02 +01: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
  • 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
  • d3499d369d minor fixes regaring the newly released patches from the pm3 community plus removed old comments in cmdmain.c iceman1001 2014-12-17 22:26:16 +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
  • a501c82b19 Applied Holiman's fixes for iclass.c and CSNs Applied PwPiwi's new parity fix. Applied Marshmellw's fixes for FSKdemod (HID, IO) iceman1001 2014-12-17 20:33:21 +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
  • 02306bac2d ADD: Enio's intuative function for the command: "hw tune", where you plot the tuning-data :) ADD: added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p" iceman1001 2014-11-30 19:16:28 +01:00
  • 06b58a94f0 BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed. iceman1001 2014-11-27 22:16:17 +01:00
  • 95e635947b ADD: the option to simulate tnp3xxx inthe command "hf mf sim" ADD: found some new default keys ADD: changed alot of memorys buffers to use constant values. like usbbuffer sizes, tracelogs, etc etc ADD: all changes Peter filmoore has in his pull request. iceman1001 2014-11-26 13:52:39 +01:00
  • 463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded. FIX: hf mf esave - now supports specifying 0,1,2,4 in card memory for the file to be saved. ADD: data.h - added FILE_PATH_SIZE constant ADD: hf legic load - a command help and checks for FILE_PATH_SIZE ADD: hf legis save - now checks for FILE_PATH_SIZE ADD: lf hitag - now checks for FILE_PATH_SIZE ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE ADD: data load / save - now checks for FILE_PATH_SIZE FIX: ui.c - added a case of closing a filehandle FIX: hf mf cload / csave now checks for FILE_PATH_SIZE FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE iceman1001 2014-11-16 11:22:06 +01:00
  • 961658bba9 FIX: rewrote the help text, cleaned up the code iceman1001 2014-11-14 13:32:11 +01:00
  • bd5d0f07e9 REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory ADD: added tnp3sim.lua a script which loads a dump and sends it to the pm3 device memory. iceman1001 2014-11-14 13:24:45 +01:00
  • b22f7a6bc6 FIX: Minor correction of variablename. don't even ask. iceman1001 2014-11-13 22:23:30 +01:00
  • 85578fcd4e FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn" iceman1001 2014-11-13 22:21:39 +01:00
  • a0bf7ba787 FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K and defaults to 1K. iceman1001 2014-11-13 22:13:46 +01:00
  • 5c065fa089 FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile. iceman1001 2014-11-13 22:02:36 +01:00
  • f91f0ebb35 CHG - some lua functions in utils.lua iceman1001 2014-11-13 20:14:14 +01:00
  • 47cbb2d418 ADD: tnp3.lua can now validate the checkums in the dump ADD: added CRC16 CCITT functionality to LUA FIX: tnp3.lua is now correctly decryping data while dumping iceman1001 2014-11-12 23:18:46 +01:00
  • f595de25e9 ADD: html_dumplib.lua, added the functionality to save text-files. ADD: tnp3.lua, now will save the dumped data to BIN and EML FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked iceman1001 2014-11-10 21:46:21 +01:00
  • cd5767d43d FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky ADD: utils.lua some functions to convert between ascii, bytes and strings. iceman1001 2014-11-09 19:29:47 +01:00
  • 22f1c57786 Updated tnp3.lua added some possibilities to abort the "hf mf nested" command added a rudimentary items identification for tnp3xxx iceman1001 2014-11-09 17:22:04 +01:00
  • 9b989c45b9 FIX: minor parseing bug when loading dumpkeys.bin file. ADD: added some useful helperfunctions to utils.lua iceman1001 2014-11-05 19:16:54 +01:00
  • 1a5ff2c2a7 FIX: fixed the layout of data in tnp3.lua iceman1001 2014-11-03 22:29:43 +01:00
  • 8aa79dee20 FIX: added some tnp3xxx identification i formatMifare.lua FIX: tnp3.lua is more or less finished. Needs testing. iceman1001 2014-11-03 21:59:31 +01:00
  • c70cef9734 fixing scripts/tnp3.lua iceman1001 2014-11-03 15:25:54 +01:00
  • c15d2bdc9b ADD: added identification for Mifare TNP3xxx tags. ADD: MD5-lua functionality ADD: AES 128 decrypt lua functionality ADD: test luc script for reading TNP3xxx tags CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim" iceman1001 2014-11-03 13:49:19 +01:00
  • a25d5c1cde test: hf 15 sim.. iceman1001 2014-10-31 09:26:35 +01: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
  • 0222acfcf3 ADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only. Be extremly cautious when writing to Block 0xFF iceman1001 2014-10-30 15:28:45 +01:00
  • 5ea2c88515 FIX: maybe I should actually send the uid bytes with the command request.... iceman1001 2014-10-30 14:29:31 +01:00
  • 3649b640e6 CHG: added possiblity to send <UID> into the "HF 15 SIM" iceman1001 2014-10-30 14:11:37 +01:00