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

1181 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 08e8317c21 More annotations to iso14443b protocol listings 2015-01-27 16:34:45 +01:00
Martin Holst Swende 16b75f27c3 Minor tweaks to iso14443b snoop tracing 2015-01-27 16:34:11 +01: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
Martin Holst Swende 03dc174036 Minor refactoring 2015-01-27 09:06:01 +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 aeadbdb216 Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers. 2015-01-26 22:10:05 +01:00
Martin Holst Swende 7c676e7269 Some documentation 2015-01-26 21:15:28 +01: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 7242efa07c bugfix 2015-01-22 23:04:59 +01:00
Martin Holst Swende cb366e9dbd Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions 2015-01-22 23:01:29 +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 3fd26a683d On another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2 if you have multiple) 2015-01-22 00:33:49 +01:00
Martin Holst Swende 388c92bde5 Generic tracing pt.4: Deprecated old 'hf 14b list' command 2015-01-22 00:19:20 +01:00
Martin Holst Swende c54d1394c6 Fixed compiler error 2015-01-22 00:10:09 +01:00
Martin Holst Swende 9e8255d4e9 Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory 2015-01-21 23:53:40 +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 355c8b4a7d Generic trace pt2: made iso14443b use standard trace format 2015-01-18 20:23:58 +01:00
Martin Holst Swende 80fe723570 Generic trace pt1: Moved arm-side trace functionality into util-package 2015-01-18 20:21:53 +01: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
Martin Holst Swende 758f1fd1f3 Fixed issue #43 on github 2015-01-15 16:07:58 +01:00
Martin Holst Swende 6b038d192a Minor dox 2015-01-15 15:45:54 +01:00
Martin Holst Swende 1eb874ee3f Merge branch 'master' of github.com:Proxmark/proxmark3 2015-01-15 15:45:15 +01:00