RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-28 03:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
1619 commits 3 branches 14 tags 85 MiB
Commit graph

186 commits

Author SHA1 Message Date
iceman1001 b1db38e1b7 ADD: piwi's compiler flags -O2 2015-03-18 20:29:58 +01:00
iceman1001 a087e9cf40 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-16 14:02:08 +01:00
marshmellow42 2147c30778 FIX EM Error 
missed two files for last push..  sorry
 2015-03-16 08:39:18 -04:00
iceman1001 05446d5bc3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	common/crc.c
	common/crc.h
	common/lfdemod.c
	include/crc.h
	include/crc.h.old
 2015-03-16 13:13:18 +01:00
iceman1001 db69363840 ADD: started to add a offset possibility for the LF T55XX. 
Ie.
  lf t55xx read 0
  lf t55xx special
  lf t55xx config o 2
  lf t55xx read 0

ADD:  added @marshmellows latest changes to psk
 2015-03-14 08:43:48 +01:00
marshmellow42 7a8a982bde adjust pskdemod 
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
 2015-03-13 20:49:34 -04:00
marshmellow42 e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
marshmellow42 5279085ae7 Merge remote-tracking branch 'upstream/master' 2015-03-13 11:20:00 -04:00
marshmellow42 73d04bb417 data psk demod minor fixes, pyramid demod add CS 
also adjusted autocorrelate and added a printout for lf search u
 2015-03-13 11:09:12 -04:00
iceman1001 a8cd503dd5 FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right checksum. Change POLY from 0x31 -> 0x8C 2015-03-12 20:33:36 +01:00
iceman1001 83a42ef965 FIX: move and rename the CRC8Maxim method into crc.c 2015-03-12 14:12:14 +01:00
iceman1001 3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +01:00
iceman1001 12d708fec1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
 2015-03-10 09:18:35 +01:00
Martin Holst Swende 58e93ff593 Merge pull request #74 from marshmellow42/master 
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
 2015-03-10 00:25:51 +01:00
iceman1001 652c39c63b Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-09 22:03:24 +01:00
marshmellow42 1302428367 finish data printdemodbuffer command 2015-03-09 16:56:00 -04:00
pwpiwi 16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. 2015-03-09 21:36:27 +01:00
marshmellow42 712ebfa6df 1 bug fix + code trimming 2015-03-07 23:31:23 -05:00
marshmellow42 11081e0459 finish gProxII_Demod 2015-03-03 16:20:18 -05:00
marshmellow42 3bc66a96fe added PSK2 to lf simpsk 
testing still ongoing.
 2015-02-21 22:54:52 -05:00
marshmellow42 872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
marshmellow42 40148ab609 Merge remote-tracking branch 'upstream/master' 2015-02-19 21:38:17 -05:00
marshmellow42 abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" 
This reverts commit e396001c47.
 2015-02-19 21:35:34 -05:00
marshmellow42 e396001c47 Revert "lf simask, lf simfsk and bug fixes" 
This reverts commit fb0c84c3df.
 2015-02-19 21:22:05 -05:00
marshmellow42 fb0c84c3df lf simask, lf simfsk and bug fixes 2015-02-19 21:21:11 -05:00
iceman1001 f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
 2015-02-19 11:32:11 +01:00
Martin Holst Swende 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
Martin Holst Swende 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 2015-02-18 20:02:44 +01:00
iceman1001 1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-10 09:01:31 +01:00
marshmellow42 f3bf15e484 lf/data combined detectclock functions to one 
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
 2015-02-09 11:11:04 -05:00
marshmellow42 6de4350803 data askraw patches, data askedgedetect demod, 
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
 2015-02-06 14:36:25 -05:00
iceman1001 64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
 2015-01-29 21:39:33 +01:00
marshmellow42 a1d17964a2 lf demod bug fix & refactor 
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
 2015-01-27 14:51:12 -05:00
marshmellow42 8c65b650e8 clean up some comments 2015-01-26 17:49:30 -05:00
marshmellow42 04d2721b3c lf psk demods 
clarify existing as psk1
added psk2 demod
 2015-01-26 17:23:19 -05:00
marshmellow42 9c0f13d5dd Merge remote-tracking branch 'upstream/master' 2015-01-26 17:07:49 -05:00
marshmellow42 03e6bb4aed lf FSK demod tools/fixes 
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
 2015-01-22 14:24:03 -05:00
marshmellow42 ec75f5c10a lf Bug Fixes and lf demod additions 
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
 2015-01-20 17:28:51 -05:00
iceman1001 5ee701292f Step 2 - Ultralight / Ultralight-C 
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
 2015-01-20 21:23:04 +01:00
iceman1001 5149e37e66 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-20 09:32:53 +01:00
marshmellow42 1e090a61a1 lf demod additions 
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
 2015-01-18 18:13:32 -05:00
marshmellow42 dc065b4e34 slight em410xdecode adjustments 
a little faster
 2015-01-13 17:52:48 -05:00
marshmellow42 84871873a4 Small lf bug fixes and threshold adjustments 
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
 2015-01-13 17:21:36 -05:00
marshmellow42 ae6ead3dc8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	client/cmdlf.c
 2015-01-13 16:02:23 -05:00
marshmellow42 ac3ba7ee69 lf search use new psk, small demod adjustments 
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
 2015-01-09 16:46:17 -05:00
iceman1001 952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/graph.c
 2015-01-08 22:23:45 +01:00
marshmellow42 c12512e99a minor code cleanup 2015-01-07 23:02:00 -05:00
marshmellow42 ba1a299ce6 code cleanup. re-added psk commands. 
also fixed a bug in detect clock functions.
sync with master prep for pull request
 2015-01-07 18:14:27 -05:00
marshmellow42 c07b79fcbf sync with master lf files to resolve conflicts 2015-01-07 18:13:27 -05:00
marshmellow42 4118b74dc8 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-07 18:13:26 -05:00
iceman1001 b5be31f996 FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
ADD: crc32.c functionality
 2015-01-07 22:56:20 +01:00
iceman1001 23b598ee23 CHG: Minor code clean up. 
ADD: crc16.c - new crc16_ccitt calc.
 2015-01-07 20:40:22 +01: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 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 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
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
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
marshmellow42 f822a063b3 lf demod code cleanup - added fskraw arguments 
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
 2014-12-31 02:27:30 -05:00
marshmellow42 2df8c07907 minor setting adjustments/cleanup 
clean up code
 2014-12-29 15:58:59 -05:00
marshmellow42 66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
marshmellow42 eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05:00
iceman1001 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
 2014-11-12 23:18:46 +01:00
iceman1001 f6c18637ca chg: LF t55xx trace 
new:  LF t55xx info
 2014-10-06 19:42:50 +02:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
penturalabs c3963755b7 Implement replay command. 2014-04-15 11:47:01 +01:00
roel@libnfc.org 7bb9d33e2c fixed warnings on Mac OS 10.8, xcode 5 2013-09-25 10:40:16 +00:00
roel@libnfc.org cfcd80459f reverted back to no 'official' modem protocol supported 2013-04-15 09:15:36 +00:00
roel@libnfc.org 2aded84aa8 USB CDC patch by jonor to enable working under kernel 2.6.27 2013-04-13 05:18:45 +00:00
roel@libnfc.org 28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org 6e82300dda removed all old usb calls 2012-12-05 16:14:10 +00:00
roel@libnfc.org 902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
roel@libnfc.org d19929cbe8 MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks, part 2 2012-09-18 13:53:17 +00:00
Merlokbr@gmail.com 39864b0bd4 "hf mf sniff" low level logics works. 2012-07-11 15:52:33 +00:00
dn337t@gmail.com 18d4eec685 removed commented out CFLAGS setting (probably committed by mistake) 2012-07-03 12:14:46 +00:00
dekoninggans@gmail.com 5f60ac5716 Changed arm-eabi- to arm-none-eabi (new convention) 2012-06-28 13:56:21 +00:00
adrian@atrox.at 0546b4aaf7 added more cards to iso15693 uid database, and some minor cleanups 2012-06-20 17:15:21 +00:00
roel@libnfc.org 245e844e80 fix temp changes 2011-09-05 11:48:08 +00:00
roel@libnfc.org 38c4979dae fix compiling under MAC OSX 2011-09-05 11:44:45 +00:00
Merlokbr@gmail.com 20f9a2a1d5 1. Mifare read block command 
2. Mifare read sector (via 1)
3. Mifare write block
4. fixed several bugs in iso 14443 select
added
Issue 23
Issue 26
 2011-05-26 12:55:15 +00:00
dekoninggans@gmail.com cee5a30d53 Added iClass eavesdrop support for Proxmark3 2011-05-18 12:33:32 +00:00
adam@algroup.co.uk 9455b51c2a Issue 20 patch (refactored code of the iso15693 implementation as well as several enhancements) [Adrian Dabrowski "atrox"] 2010-10-19 14:25:17 +00:00
adam@algroup.co.uk 602ac4d7c5 multiple proxmark device support [Mohamed Elsabagh] 2010-05-14 11:04:28 +00:00
adam@algroup.co.uk bd84638614 create target for binary file archive (linux version) 2010-05-09 12:17:42 +00:00
adam@algroup.co.uk 3612a8a8e2 legic write/simulate [Anon] 2010-05-06 11:24:01 +00:00
adam@algroup.co.uk 538300eed8 legic code tidy up [Hagen Fritsch] 2010-05-04 14:31:54 +00:00
yobibe b38742c92c Fix small issue in make help 2010-03-29 10:36:26 +00:00
izsh@fail0verflow.com e7227419e5 Don't modify the PATH to prevent from mixing multiple arm-eabi compilers in the PATH 2010-03-04 00:33:05 +00:00
adam@algroup.co.uk 09c1ce4bdd put arm-eabi compiler back on path for those that have followed devkitpro installation instructions 2010-02-27 09:05:03 +00:00
marcansoft 98540684df Link using gcc and get rid of the LIBGCC stuff 
GCC knows how to find libgcc, and the proper way to link C code is to
use gcc, not ld.
 2010-02-26 14:03:03 +00:00
marcansoft b7913d8f4b Make version data const 2010-02-26 14:02:27 +00:00
marcansoft 845ea63b7c Clean up common linker script 2010-02-26 13:59:37 +00:00
izsh@fail0verflow.com a63deed172 common/Makefile.common: Revert the DEVKITARM change. Just need to put the cross compiler in the path. No need to hardcode for a given distribution and a given version. 2010-02-26 13:06:07 +00:00
adam@algroup.co.uk 30351384b6 correct paths for devkitPro Linux development environment 2010-02-22 12:36:42 +00:00