RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-23 21:48:38 +08:00
Code Issues Projects Releases Packages Wiki Activity
743 commits 3 branches 15 tags 87 MiB
Commit graph

357 commits

Author SHA1 Message Date
Martin Holst Swende
fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys 2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +02:00
pwpiwi
b03c0f2d86 bugfixes hf mf sim 
- output of debug messages caused communication failures due to timing issues.
  hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
 2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d minor bugfixes to hf mf sniff and hf 14a snoop 
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
 2014-07-15 08:39:56 +02:00
pwpiwi
9a573554e0 minor bugfix and enhancement to hf 14a reader 
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
 2014-07-15 08:35:27 +02:00
pwpiwi
1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-07-01 07:09:21 +02:00
pwpiwi
19d6d91fd5 hf 14a reader enhancement 
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
 2014-06-30 08:21:50 +02:00
Martin Holst Swende
42f57e0294 Merged with master 2014-06-27 13:16:31 +02:00
Martin Holst Swende
77abe781af fix for better csns 2014-06-27 12:52:28 +02:00
pwpiwi
72b1090acf Bugfixes: 
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
 2014-06-26 07:57:49 +02:00
iZsh
b014c96d68 new command "lf snoop" to snoop raw ADC values 
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.

armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.

client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
 2014-06-21 21:33:54 +02:00
iZsh
7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
Martin Holst Swende
9f6e9d1575 More work on iclass simulation attack 2014-06-16 21:27:12 +02:00
Martin Holst Swende
d51b2eda8f Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577 2014-06-11 08:42:37 +02:00
Martin Holst Swende
f83cc12613 More work on iclass 2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping 2014-04-24 14:13:33 +02:00
Philippe Teuwen
19e2a10de5 Markdown help: use fixed column width 2014-03-27 16:49:37 +01:00
Philippe Teuwen
46782176fc Restore original inline help behavior as we've now separate fcts for -h/-m 2014-03-26 23:51:22 +01:00
Philippe Teuwen
dec8e8bd9f Provide option -m for markdown help dump, -h for text dump 2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e Fix description in help dump 2014-03-26 22:44:25 +01:00
Philippe Teuwen
b5727175c0 Fix offline column in help dump 2014-03-26 22:40:41 +01:00
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
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
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
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
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
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
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
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