RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-16 06:43:29 +08:00
Code Issues Projects Releases Packages Wiki Activity
3829 commits 3 branches 14 tags 87 MiB
Commit graph

3829 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
iceman1001
754a35e72b ADD: added the ioprox checksum test to IOdemodFSK 
MENTIONED HERE:  http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD:  changed the layout of the HID descramble patterns a bit,  and rearranged some hex/dec outputs.
 2015-03-23 17:11:45 +01: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
9552d5919b ADD: Added em410x de-scramble patterns: Paxton, Sebury, Pattern1. 2015-03-20 11:48:47 +01:00
iceman1001
6255c8b107 FIX: printEM410x - DEZ 10 was missing highest byte. 
ADD: printEM410x - Now prints DEZ 3.5B
ADD: printEM410x - Now prints DEZ 3.5C
 2015-03-19 22:50:23 +01:00
iceman1001
d21e0f1ce0 ADD: Implemented DEZ-20/ZK for EM410x decoding. Thanks to Asper for docs. 2015-03-19 22:20:35 +01:00
iceman1001
f1170fa79e ADD: "HF MFU CRDBL", Started to add the password for reading blocks. Wasn't used before :( 2015-03-18 20:34:17 +01: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
1c6490cddc FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combinations for PSK1. 
Uncomment lines in main to test PSK2, PSK3.
 2015-03-18 20:29:18 +01:00
iceman1001
ca65d3af86 ADD: new tests for the T55XX commands. 
CHG:  minor output messages in cmdlft55xx.c
 2015-03-18 17:32:43 +01:00
iceman1001
78e875807f FIX: narrowed down the detect modulation even further. 
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .

MISSING:
the detect, trace, info,  doesn't use a password for those tags with enabled password-mode.
 2015-03-16 22:45:06 +01:00
Martin Holst Swende
29a7954177 Merge pull request #80 from marshmellow42/master 
FIX EM Error
 2015-03-16 14:03:48 +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
595b623bf4 CHG: removed an extra space. 2015-03-16 11:40:44 +01:00
iceman1001
8713b64fdf CHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detection, and some minor corrections regarding the enum, 
CHG: @Marshmellow added PSK1, PSK2, PSK3.   Almost complete now. Waiting for Biphase.
ADD: @Marshmellows lf- psk demod changes,
CHG: In "lf t55xx info" the manufacturerer name is now identified and printed.
CHG: In "lf t55xx info" the modell name is now identified and printed,  however it can only identify two models presently.
 2015-03-16 11:39:31 +01: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
iceman1001
545158b398 FIX: lf t55xx config now handles offsets. 
FIX: lf t55xx trace now handles offsets.
FIX: lf t55xx info now handles offsets.
 2015-03-15 21:36:38 +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
iceman1001
2c5ed70651 CHG: minor output change, when printing found multiple modulations 
CHG: PSKDemod should be called like this according @Marshmellow
 2015-03-13 21:24:37 +01:00
iceman1001
8a13121435 CHG: now with enums :) 2015-03-13 21:02:04 +01:00
iceman1001
710208245b ADD: printConfiguration method for a nice printout of the selected configuration. 2015-03-13 19:12:11 +01:00
marshmellow42
e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
iceman1001
8e726f6c37 CHG: Removed an unneccesary parameter for "hf mf sim" 2015-03-13 18:50:30 +01:00
iceman1001
d8c927bcec FIX: removed a debug statement 
FIX: initialisation of some variables is done correct.
 2015-03-13 18:49:43 +01:00
iceman1001
7b40affb6f FIX: lf t55xx commands seem to work like they should. Detect now detects between FSK/ASK/NZ/PSK 2015-03-13 17:36:40 +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
iceman1001
33add18764 CHG: rename of methods to follow naming convention 
CHG: LF T55XX CONFIG now defaults to ASK, non-inverse
 2015-03-13 10:05:37 +01:00
iceman1001
108262a145 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-13 09:22:12 +01:00
iceman1001
4d60f1562f FIX: Marshmellow hinted that I should use another fskclock method, which obeys the verbose parameter. 2015-03-13 09:00:04 +01:00
iceman1001
c387fd49a7 CHG: removed a loop after suggestions that it was unnecessary. 2015-03-13 08:59:07 +01:00