Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-22 07:46:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
1765 commits 3 branches 11 tags 34 MiB
Commit graph

238 commits

Author SHA1 Message Date
marshmellow42 59f726c989 EM4x05/EM4x69 continued + a couple of icemans utils. 2017-02-15 23:27:15 -05:00
marshmellow42 01d0f8ae8f bug fixes - LF rawdemod am and ST 
rawdemod parameter length test too short for help text
amp option should amp prior to ST check
ST check adjusted to make room for rf/32 clock instead of rf/64 (so will
have extra room if clock is higher than 32)
ST check improved to better account for low drift
 2017-01-20 00:55:40 -05:00
ikarus 2943527472 Fixed all "misleading-indentation" warnings (fixes #187). 2016-09-26 21:15:49 +02:00
ikarus 9b3c48688e Revert "Do not treat gcc's "misleading-indentation" warning as error." 
This reverts commit fd4f21b766.
 2016-09-26 20:39:31 +02:00
ikarus fd4f21b766 Do not treat gcc's "misleading-indentation" warning as error (fixes #187). 2016-09-26 19:21:01 +02:00
marshmellow42 c872d8c177 update hf mf sim x attack mode - start 10byte uid.. 
..support  (some from @iceman1001)
(sim reader attack currently testing std mfkey32 vs mfkey32_moebius
version...)  possibly will remove one later.
 2016-06-24 01:31:27 -04:00
marshmellow42 16ea2b8ca3 fix askAmp 
again... must have been something i missed before.  this function wasn't
complete.
 2016-06-20 00:42:03 -04:00
marshmellow42 cf194819cc simplify some code, add comments 
ABS simplification from Iceman1001
 2016-03-19 00:09:58 -04:00
marshmellow42 6923d3f14f Add @iceman1001 s presco and pyramid functions + 
plus comment some includes.
fix indala error checking bugs
cmddata.h previously relied on several headers being included prior to
cmddata.h, now self contained.
 2016-03-05 23:45:28 -05:00
marshmellow42 88e85bde41 refactor gProxII demod... add 0 spacer to ... 
... parity functions (remove, add)
make MAX_GRAPH_TRACE_LEN match with client side
 2016-02-29 17:05:02 -05:00
marshmellow42 01d7272d5b Merge remote-tracking branch 'upstream/master' 2016-02-20 10:10:10 -05:00
marshmellow42 b96bcc795b finish LF ASK Sequence Terminator detection 2016-02-19 15:09:51 -05:00
William Robinet 63744b5681 Typos 2016-02-17 15:44:18 +01:00
marshmellow42 d1869c3336 Add LF ASK Sequence Terminator detection... 
...and demodulate data beginning after the first ST
also add some type casts in print calls.
 2016-02-16 12:49:30 -05:00
William Robinet b8140ab108 Fix typos 2016-02-11 23:03:15 +01:00
ikarus 7ede3c7122 Remove include statement that causes trouble (fix #151). 
See: https://github.com/Proxmark/proxmark3/issues/151
 2015-12-23 23:51:49 +01:00
marshmellow42 ace26dbdfd Fix printdemodbuffer length tests + add length... 
parameter
increase askdemod MaxBits
fix util.c sprint_bin_break and increase buffer size (had memory
overflow possible before)
 2015-12-07 21:18:30 -05:00
marshmellow42 709665b5d1 lf viking build / lf awid refactor / lfdemod.c debugMode==2 
lf viking from other users - just put my spin on it
lf awid refactored code - possible to make it not 26bit specific now
with minor chanages
lfdemod.c now supports extra debug printing if `data setdebug` = 2 when
not on device (on client not arm)
 2015-11-22 00:00:32 -05:00
marshmellow42 6fe5c94bda lf demod cleanup nrz clock detect fixes 
slight adjustment to lf t55xx sampling code to start at the same spot
more consistently
reduce indala detection false positives
lf t55xx commands heavily tested and seem to be stable and reliable on
most modulations/bitrates (excluding Sequence Terminator configured
cards).
 2015-11-18 00:10:11 -05:00
marshmellow42 db8296025f lf t55xx and some lf demod fixes/adjustments 
finally think I like the lf t55xx detect and read cmds.  pretty reliable
now.
 2015-11-16 18:49:20 -05:00
marshmellow42 14331320c4 Fix viking demod bug - clean my indala demod code 
NOTE lf indalademod is still available as it uses a different technique
to demodulating, which sometimes works better (and sometimes worse).
 2015-11-10 11:59:41 -05:00
marshmellow42 3ea7254a57 add checksum to viking demod 2015-11-09 23:48:39 -05:00
marshmellow42 415274a7c3 Add Viking demod, 
fix compiler warning for int vs uint8_t for em410x sim clock variable
 2015-11-09 23:09:26 -05:00
marshmellow42 8949e04584 Merge remote-tracking branch 'upstream/master' 2015-11-03 20:19:46 -05:00
marshmellow42 76346455d2 minor lf updates/cleanup 2015-11-03 20:18:16 -05:00
pwpiwi b2fe0e77c5 Merge branch 'topaz' 
Conflicts:
	CHANGELOG.md
	client/cmdhf.c
 2015-11-03 21:06:59 +01:00
marshmellow42 9f669cb26f minor cleanups 2015-10-31 23:12:42 -04:00
marshmellow42 3606ac0a2b refactor lfops t55xx functions 
share t55xx configuration register definitions with client for later use
(warning - compiled but not fully tested yet)
 2015-10-24 09:54:04 -04:00
marshmellow42 f4eadf8a50 adjust lf t55xx read commands 
seems to make them a lot more accurate for me
 2015-10-15 01:09:49 -04:00
pwpiwi 8e21541e77 Merge branch 'master' into topaz 2015-08-25 07:53:00 +02:00
marshmellow42 bbd19beced update books to app_areas. clearer. 2015-07-25 23:24:53 -04:00
marshmellow42 b82d809852 update iClass chip identification 2015-07-25 23:09:07 -04:00
marshmellow42 6b659d2406 Merge remote-tracking branch 'upstream/master' into iclass 2015-07-20 21:26:35 -04:00
marshmellow42 a40680f3ac Merge remote-tracking branch 'upstream/master' 2015-07-20 17:29:52 -04:00
Martin Holst Swende d2deaf7bcf Fixed some indentation 2015-07-20 23:18:46 +02:00
marshmellow42 aa53efc340 iclass additions 
multiple contributors - thanks!
 2015-07-20 13:41:40 -04:00
Martin Holst Swende 83f3f8ac40 Potential fix for 0-length usb packets seen on OSX 2015-07-17 00:01:58 +02:00
marshmellow42 29b6cacc6f more verification on FDX-B tag demod - reduce... 
... false positives
 2015-07-05 23:35:00 -04:00
pwpiwi db2b81ba11 Merge branch 'master' into topaz 
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
 2015-07-01 08:17:00 +02:00
pwpiwi 2da2e92837 Merge pull request #109 from pwpiwi/image_shrink 
Compress FPGA configs and initialized data
 2015-06-24 07:47:45 +02:00
pwpiwi 9f9b6b7469 Merge pull request #120 from pwpiwi/fix_compile_errors 
fix issue #116: remove includes of stdio.h in armsrc
 2015-06-18 11:38:58 +02:00
pwpiwi 50365fedcb fix issue #116: remove includes of stdio.h in armsrc 2015-06-18 11:33:53 +02:00
marshmellow42 07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42 6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04:00
marshmellow42 b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42 fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42 04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
marshmellow42 1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
pwpiwi f39198789b replaced gzip with an own compressor tool (fpga_compress.c, based on zlib) 
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
 2015-05-26 08:31:26 +02:00
pwpiwi 25056d8b47 Finish support for compressed FPGA images in fpgaloader.c 
- move zlib source files to separate directory zlib
- rename zlib/crc32.[ch] to zlib/z_crc32.[ch]
 2015-05-26 08:31:24 +02:00
pwpiwi add4d47046 add: compress fpga images during compile, uncompress at run time 2015-05-26 08:31:21 +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
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
pwpiwi 6306ff4bac Merge branch 'master' into topaz 
Conflicts:
	armsrc/Makefile
	client/Makefile
 2015-04-05 19:45:59 +02: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
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
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
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
pwpiwi 48ece4a750 add: Topaz mode for "hf 14a raw" (new option -T) 
chg: allow tracing without parity
chg: make "hf list topaz" aware of additional commands for Dynamic Memory Model
 2015-03-20 21:06:51 +01:00
pwpiwi 05ddb52c43 fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding() 
chg: use -O2 instead of -Os when compiling ARM sources
chg: don't clear the Miller decoders input buffer on reset
chg: be more specific for the Miller decoders start bit pattern
add: new option c in hf list: mark CRC bytes (default is off)
 2015-03-18 18:32:43 +01:00
marshmellow42 2147c30778 FIX EM Error 
missed two files for last push..  sorry
 2015-03-16 08:39:18 -04: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
pwpiwi ee1eadee0f add: start to support Topaz tags 
- hf 14a reader now exits gracefully in case of proprietary anticollision sequence
- changed miller decoder to handle Topaz 8 data bits/no parity frames from reader
- started to implement hf list topaz
 2015-03-13 18:13:18 +01: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
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
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
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
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
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