DeforaNetworks/proxmark3
3
0
Fork 0
Code Releases Activity
1,088 Commits 9 Branches 0 Tags
6e6f1099c83989b45c494d18cf701ffcff4af5ee
Commit Graph
1088 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pwpiwi 6e6f1099c8 hf topaz reader: add support for dynamic lock areas 2015-07-01 07:12:10 +02:00
pwpiwi 6306ff4bac Merge branch 'master' into topaz 
Conflicts:
	armsrc/Makefile
	client/Makefile
 2015-04-05 19:45:59 +02:00
Martin Holst Swende 9795e535c9 Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf 2015-04-01 09:24:29 +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
Martin Holst Swende d5d6f22718 Merge pull request #91 from marshmellow42/master 
lfdemod.c refactoring  (+ bug fixes)
 2015-03-31 22:11:19 +02:00
pwpiwi 7009555e44 temporarily revert lfdemod float removal 2015-03-31 21:38:58 +02:00
marshmellow42 a4669d6ef3 small fix in t5 trace data 2015-03-31 11:30:16 -04: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
pwpiwi c5847ae8af refactoring hf topaz reader 2015-03-31 07:09:55 +02:00
Martin Holst Swende 616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com 2015-03-30 07:51:45 +02:00
Martin Holst Swende caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42 070e3c4305 Merge remote-tracking branch 'upstream/master' 2015-03-27 23:49:14 -04: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
pwpiwi de15fc5fe3 add: hf topaz reader (basic functionality) 2015-03-25 22:00:48 +01:00
Martin Holst Swende 337288f9ac Merge pull request #86 from marshmellow42/master 
Fixed indents to Tabs from Spaces
 2015-03-25 20:23:41 +01:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
Martin Holst Swende 062e28912c Merge pull request #84 from marshmellow42/master 
EM410x bug fix
 2015-03-25 11:10:51 +01:00
marshmellow42 327a690813 EM410x bug fix 2015-03-24 23:05:46 -04:00
marshmellow42 c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42 90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
Martin Holst Swende 90a8b82fb4 Merge pull request #82 from marshmellow42/master 
lf ata55x7 commands and more
 2015-03-24 11:10:16 +01:00
marshmellow42 9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -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
pwpiwi ef00343cb1 revert change "hf list topaz" to "hf list nfc" 
refactored Startbit detection in MillerDecoding()
relaxed startbit detection in MillerDecoding()
fixed CRC checking and CRC bytes marking in hf list
fixed topaz multi frame command listing in hf list topaz
 2015-03-17 07:41:08 +01:00
Martin Holst Swende 29a7954177 Merge pull request #80 from marshmellow42/master 
FIX EM Error
 2015-03-16 14:03:48 +01:00
marshmellow42 2147c30778 FIX EM Error 
missed two files for last push..  sorry
 2015-03-16 08:39:18 -04:00
Martin Holst Swende 2e7e107c82 Merge pull request #78 from marshmellow42/master 
add pyramid CS, minor psk demod fixes, minor g-prox-ii demod fix, autocorrelate improvement
 2015-03-16 11:39:03 +01:00
marshmellow42 b41534d142 adjust ask/biphase handling - more complete 
also added XL EM410x formats
 2015-03-15 22:03:50 -04:00
pwpiwi a8904ebd46 Change "hf list topaz" to "hf list nfc" 
fix: reduce length of expected unmodulated signal in Miller decoder in order
to allow decoding of NFC reader communications
add: hf list nfc: aggregate reader commands into one line
add: hf list nfc: CRC check for NFC communications
 2015-03-15 16:49:09 +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
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 9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
marshmellow42 5279085ae7 Merge remote-tracking branch 'upstream/master' 2015-03-13 11:20:00 -04:00
marshmellow42 d9d41e0f3f minor g-prox-ii demod fix 
lf search was occasionally outputting false results.
 2015-03-13 11:18:55 -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
pwpiwi 9185099ed8 Merge pull request #75 from pwpiwi/qtmakefile 
(issue #47) use Qt5 includes and libraries, if present
 2015-03-13 07:24:56 +01:00
Martin Holst Swende aaa9f05e31 Merge pull request #77 from Proxmark/usb_check 
Implemented usb_poll() within LF sim.
 2015-03-12 18:15:08 +01:00
Martin Holst Swende f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB 2015-03-12 16:32:01 +01:00
pwpiwi 04bc1c660b fix: hf 14a raw was broken 
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
 2015-03-11 20:19:30 +01:00
pwpiwi 8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +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
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 5658e82e1e sim buffer max settings tests 2015-03-09 15:58:06 -04:00