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
1454 commits 3 branches 14 tags 85 MiB
Commit graph

168 commits

Author SHA1 Message Date
iceman1001 0df669a298 ADD: next step ISO11784/85 2015-06-03 21:35:03 +02:00
iceman1001 615f21dde2 FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase. 
ADD: started witha  ISO11784/85 demod function.
 2015-06-03 21:12:24 +02:00
iceman1001 ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +02:00
iceman1001 bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
marshmellow42 a98b05b71d missed file in previous commit... 
duh...
 2015-05-19 15:03:35 -04:00
marshmellow42 d730878d8c scripting updates from @iceman1001 
it compiles but i'm not sure how to fully test it...
:)
 2015-05-13 21:14:35 -04:00
iceman1001 2c39c25c67 Minor clean ups 2015-05-13 09:06:47 +02:00
iceman1001 aebe77905b CHG: extracted the UL_C & UL magic tests. 
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love,  looks better too.
      UL_EV1 / NTAG,  only try known passwords if AUTHLIM is set to 0.
 2015-05-06 22:40:46 +02:00
iceman1001 7d010c4991 chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION 2015-05-05 00:37:13 +02:00
iceman1001 11b1e2e506 ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation 2015-04-26 18:03:21 +02:00
iceman1001 fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
marshmellow42 fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
marshmellow42 cc15a1187b lf cleanup - fixes 
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
 2015-04-06 23:17:30 -04:00
marshmellow42 2767fc0291 lf cleaning 
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
 2015-04-05 00:58:57 -04:00
marshmellow42 6e98444637 lfdemod reduce duplicate code 
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
 2015-04-02 23:55:12 -04:00
marshmellow42 23f0a7d862 lfem4x cleanup/add/fix 
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
 2015-04-02 12:48:52 -04:00
iceman1001 49dc1d0a9e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
 2015-04-01 18:02:10 +02:00
iceman1001 7a2029ec7c ADD: some changes from Marshmellow 2015-04-01 17:54:19 +02:00
pwpiwi f83c41c75b Merge pull request #89 from pwpiwi/image_shrink 
Reclaim more than 19K of ARM flash memory.
 2015-03-31 22:57:33 +02:00
pwpiwi 7009555e44 temporarily revert lfdemod float removal 2015-03-31 21:38:58 +02:00
marshmellow42 75cbbe9a69 remove floats per piwi 2015-03-31 10:49:06 -04:00
pwpiwi e335ca2846 Reclaim more than 19K of ARM flash memory. 
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
 2015-03-31 08:07:26 +02:00
iceman1001 02d352fea7 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
 2015-03-30 21:11:37 +02:00
iceman1001 7c99b4f782 CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller. 
REF: https://github.com/Proxmark/proxmark3/issues/83
 2015-03-30 16:27:07 +02:00
marshmellow42 f8f894a50f rawdemod param cleanup 
plus lfdemod.h cleanup
 2015-03-27 23:47:31 -04:00
marshmellow42 2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42 90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
iceman1001 0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
marshmellow42 1fbf895616 lf updates 
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
 2015-03-23 16:29:50 -04:00
marshmellow42 13d77ef964 lf t5 read plus lf demod adjustments 
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
 2015-03-22 15:28:48 -04:00
iceman1001 251d07dbfb ADD: cmdlf autocorrelations, also gives a hint to how many bytes the possible correlation is. 
CHG: "LF SEARCH 1 U" didn't work since the strcmp was too short. Increased length of check.
FIX: @marshmellows fix for faulty em410xdecoding of length less than 64.
 2015-03-18 20:32:53 +01:00
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