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

694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Holst Swende
57c695563f Fixes to implement generation of markdown auto-generated documentation 2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5 Add option -h to dump complete set of supported commands 
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.

git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
 2014-03-26 22:33:11 +01:00
W8M2Hg9lLmWqXSGC
b27c190924 Update README.txt 
Removed old information.
 2014-03-26 15:12:32 +11:00
holiman
f5a1a9ce47 Merge pull request #8 from pwpiwi/master 
add .gitignore and merge svn r852
 2014-03-25 21:49:05 +01:00
pwpiwi
d714d3effc Improvements/Fixes to 14443 sniffing/snooping 
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
 2014-03-25 21:38:24 +01:00
pwpiwi
1929af0c9e Provide .gitignore to prevent unwanted files to be committed 2014-03-25 21:31:37 +01:00
W8M2Hg9lLmWqXSGC
88c637e6cd Merge pull request #7 from PenturaLabs/master 
Re-submitting Midnitesnake's Mifare Ultralight Patch
 2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC
347dea669a Merge pull request #5 from PenturaLabs/master 
Kantech ioProx Support - Fix
 2014-03-21 20:35:14 +11:00
PenturaLabs
94faa59465 Update cmdlfio.h 2014-03-21 07:51:51 +00:00
penturalabs
c86220246e Sorry, included missing files from last pull request 2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC
cf608ac8f3 Merge pull request #2 from PenturaLabs/master 
Added Kantech ioProx Support
 2014-03-19 08:47:28 +11:00
W8M2Hg9lLmWqXSGC
614367288c Merge pull request #1 from midnitesnake/master 
Unique Tag  Support
 2014-03-19 08:46:04 +11:00
penturalabs
a1f3bb120f Added Kantech ioProx Support 2014-03-18 20:52:48 +00:00
PenturaLabs
1801456ede Re-submitting Midnitesnake's Mifare Ultralight Patch 2014-03-18 14:02:32 +00:00
midnitesnake
cb967ea976 Added Unique Code to EM41x 2014-03-18 07:42:54 +00:00
midnitesnake
080ff30a9e Added Unique Code to EM41x 2014-03-18 07:41:02 +00:00
W8M2Hg9lLmWqXSGC
5e0b213d7f Added an important notice. 
Moving the repository from google code to GitHub is up for discussion!
Please check out the following thread and post your comments...
http://www.proxmark.org/forum/viewtopic.php?id=1902
Discussions will close on March 31st.
 2014-03-17 15:41:33 +11:00
martin.holst@gmail.com
0c12504a5a Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info 2014-02-27 18:10:12 +00:00
micki.held@gmx.de
552cbc5890 iso14444a: minor FPGA bugfix 2014-02-25 06:49:49 +00:00
micki.held@gmx.de
d7aa3739a9 More robust iso14443a sniffing/simulation functions by 
- iso14443a.c: less strict Miller/Manchester decoders
- FPGA hi_iso14443a.v: syncing on external readers' clock when simulating and sniffing.
 2014-02-23 15:46:19 +00:00
micki.held@gmx.de
7bc95e2e43 - fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff 
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
 2014-02-19 20:35:04 +00:00
martin.holst@gmail.com
3be2a5ae0b reverted a non-intended commit with crappy debug printouts 2014-02-05 18:53:55 +00:00
martin.holst@gmail.com
273b57a7b0 Fixed error with ar/nr-collection 2014-02-05 08:07:27 +00:00
martin.holst@gmail.com
f87941bd22 Minor typo 2014-01-31 21:24:18 +00:00
martin.holst@gmail.com
d2f487af9c Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion 2014-01-31 21:17:34 +00:00
martin.holst@gmail.com
af1caf6e4a Fixed (?) issue with mifare simulation auth failed. See http://www.proxmark.org/forum/viewtopic.php?pid=9192#p9192 2014-01-22 08:49:28 +00:00
micki.held@gmx.de
e691fc45bc - improved reader sensitivity for 14443a cards (FPGA change!) 
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
 2013-11-19 18:52:40 +00:00
martin.holst@gmail.com
6cacefa48d Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:33:48 +00:00
martin.holst@gmail.com
4c367827b5 Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:32:13 +00:00
martin.holst@gmail.com
77cd612f15 Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation 2013-11-06 18:34:10 +00:00
martin.holst@gmail.com
da9d456e9f Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed 2013-11-06 18:32:11 +00:00
martin.holst@gmail.com
b11542a7f6 Minor fix in html skeleton 2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a Some more tinkering with a generic 13.56MHz reader, still not finished 2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c First steps towards creating a generic HF reader/identifier. A coop with Asper. 2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9 Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare 2013-10-30 18:21:42 +00:00
dn337t@gmail.com
a00411152f use CLOCKS_PER_SEC instead of platform-specific hardcoded value 2013-10-22 12:14:32 +00:00
martin.holst@gmail.com
412afdb87b Fixed linebreak error 2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603 Added functionality to dump data into .eml-file 2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8 Script to convert emulator file (ASCII dump of data) into HTML 2013-10-20 18:48:04 +00:00
martin.holst@gmail.com
c44241fdea Fixed minor errors 2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com
06b82e6a6d cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p') 2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com
3f7c993d78 fix compilation issues with gcc 4.6: anonymous unions are not c99 2013-10-20 11:40:00 +00:00
martin.holst@gmail.com
6742c089b1 Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files 2013-10-19 20:18:50 +00:00
martin.holst@gmail.com
ba33066cef Minor change 2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db Added script to dump ndef-compliant tags. Written in collaboration with @asper 2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
3c9ed0e180 Put manufacturer country within brackets 2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e Some refactoring, also placed wait14443a here 2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336 Manufacturer-info, to be used in upcoming script 2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576 2013-10-17 18:28:21 +00:00
fnargwibble@gmail.com
0ae173ba23 add linux modem manager de-confliction file 2013-10-11 09:15:05 +00:00