Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-11-11 01:35:51 +08:00
Code Issues Projects Releases Packages Wiki Activity
934 commits 3 branches 11 tags 34 MiB
Commit graph

934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Holst Swende
15491b2d73 Merge pull request #53 from iceman1001/feature 
bounds check for loop - printDemodBuff
 2015-01-30 15:18:18 +01:00
Iceman
0c5998c051 Update cmddata.c 
as suggested,  a bitwise bounds check in cmddata.
 2015-01-30 15:17:07 +01:00
iceman1001
33c7e2f3bc wrong letter in variable name 
Conflicts:
	client/cmddata.c
 2015-01-29 22:35:19 +01:00
Martin Holst Swende
92623113b4 Minor documentation on 'hf list' 2015-01-29 20:01:30 +01:00
Martin Holst Swende
b3cc5f2987 Reverted erroneous commit from bigbuf-rework 2015-01-29 19:58:46 +01:00
Martin Holst Swende
63e420b572 Merge pull request #51 from marshmellow42/master 
fix hid prox standalone bug
 2015-01-29 01:11:10 +01:00
marshmellow42
0892b968ce fix hid prox standalone bug 
Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)
 2015-01-28 12:55:04 -05:00
Martin Holst Swende
4c18913dd8 Merge pull request #50 from marshmellow42/master 
lf hid fskdemod bug
 2015-01-28 18:45:02 +01:00
marshmellow42
08ebca682c lf hid fskdemod bug 
re-introduced in last bigbuf changes
 2015-01-28 11:45:31 -05:00
pwpiwi
f71f4deb8f BigBuf and tracing rework: allow much longer traces in in hf commands 
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
 2015-01-28 07:18:51 +01:00
pwpiwi
117d9ec25c Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces. 2015-01-27 22:25:55 +01:00
Martin Holst Swende
936e0729f9 Merge pull request #49 from marshmellow42/master 
LF Demod Bug Fix & new traces
 2015-01-27 22:14:39 +01:00
marshmellow42
88a3e9433d Revert "Revert "Traces"" 
This reverts commit 58f478696d.
 2015-01-27 16:08:15 -05:00
marshmellow42
003ac42c71 Revert "Revert "More Testing Traces"" 
This reverts commit eb0b5130f2.
 2015-01-27 16:08:08 -05:00
marshmellow42
eb0b5130f2 Revert "More Testing Traces" 
This reverts commit f4e739ed58.
 2015-01-27 16:05:10 -05:00
marshmellow42
58f478696d Revert "Traces" 
This reverts commit 7f9064c641.
 2015-01-27 16:05:05 -05:00
marshmellow42
7f9064c641 Traces 2015-01-27 15:56:03 -05:00
Martin Holst Swende
383608a63a Minor fixes to iso14443a annotations 2015-01-27 21:55:08 +01:00
marshmellow42
f4e739ed58 More Testing Traces 2015-01-27 15:09:45 -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
Martin Holst Swende
f50d457fa8 Merge pull request #48 from marshmellow42/master 
lf demod additions & bugfixes from marshmellow
 2015-01-27 10:21:22 +01: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
Martin Holst Swende
2595390c6d Merge pull request #46 from holiman/master 
Iceman's changes, part 2
 2015-01-26 20:59:36 +01:00
Martin Holst Swende
dca558bf9e Removed last trace of crypto from makefile 2015-01-26 20:56:33 +01:00
Martin Holst Swende
e629181f5a Fixed issue where -1 size_t was returned 2015-01-22 21:04:16 +01:00
Martin Holst Swende
afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01: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
Martin Holst Swende
c54d1394c6 Fixed compiler error 2015-01-22 00:10:09 +01:00
iceman1001
df3e429d71 minor fix for a help in "hf 14a snoop" 2015-01-21 21:24:37 +01: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
a1557c4c2f Minor fixes: Array inits, some array bounds checks. 
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph  - function in graph.c
 2015-01-20 22:14:56 +01:00
iceman1001
e469159145 FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable. 
FIX: some filehandles that didn't get closed.
 2015-01-20 21:58:53 +01:00
iceman1001
80b1b53fa3 SUGGESTED FIX: 
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum:  http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883

Where "hf mf csetuid"  empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
 2015-01-20 21:55:19 +01:00
iceman1001
fe5b3a4424 FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call. 2015-01-20 21:50:49 +01:00
iceman1001
e3c235654f Minor fixes to some help-texts. 2015-01-20 21:48:39 +01:00
iceman1001
81740aa519 STEP 3 - the actual new files for Ultralight. 
ADD: script remagic.lua  --  a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua  - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua   -  iterates thru a lot of calls to check the new psk demods.

all new scripts implements the  "-h"  for help text.
 2015-01-20 21:29:55 +01: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
c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
 2015-01-20 20:59:24 +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
53d85a8fa1 Merge remote-tracking branch 'upstream/master' 2015-01-18 18:19:26 -05: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
Martin Holst Swende
b689b842b6 Bugfix 'hf list 14b' and 'hf list raw' 2015-01-16 22:48:30 +01:00
Martin Holst Swende
41fdd0f061 First stab at adding 'hf list 14b' and 'hf list raw' 2015-01-16 22:41:19 +01:00
Martin Holst Swende
55c7e3520f Merge branch 'master' of github.com:Proxmark/proxmark3 2015-01-16 15:49:11 +01:00
Martin Holst Swende
49726b4088 Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks 2015-01-15 23:00:39 +01:00
Martin Holst Swende
5c72368e2d Merge pull request #44 from marshmellow42/master 
small lf demod bug fixes and threshold adjustments
 2015-01-15 21:53:18 +01:00
Martin Holst Swende
f164662363 Merge branch 'master' of https://github.com/iceman1001/ForPm3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-15 21:50:03 +01:00
Martin Holst Swende
d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +01:00