Commit graph

836 commits

Author SHA1 Message Date
pwpiwi 0dcf1ee3fd git housekeeping:
- added *.log files to .gitignore
- new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files
2014-06-27 19:23:42 +02:00
iZsh 3b2fee43ea New LF edge detection algorithm + lowpass filter
This is a new LF edge detection algorithm for the FPGA.

- It uses a low-pass IIR filter to clean the signal
(see https://fail0verflow.com/blog/2014/proxmark3-fpga-iir-filter.html)
- The algorithm is able to detect consecutive peaks in the same
  direction
- It uses an envelope follower to dynamically adjust the peak thresholds
- The main threshold used in the envelope follower can be set from the ARM side

fpga/lf_edge_detect.v,
fpga/lp20khz_1MSa_iir_filter.v,
fpga/min_max_tracker.v: New file.

fpga/lo_edge_detect.v, fpga/fpga_lf.v: Modify accordingly.

armsrc/apps.h (FPGA_CMD_SET_USER_BYTE1,
FPGA_CMD_SET_EDGE_DETECT_THRESHOLD): New FPGA command.
fpga/fpga_lf.v: Modify accordingly/Add a 8bit user register.

fpga/fpga_lf.bit: Update accordingly.

fpga/tests: New directory for testbenches

fpga/tests/Makefile: New file. It compiles the testbenches
and runs all the tests by default (comparing with the golden output)

fpga/tests/tb_lp20khz_1MSa_iir_filter.v,
fpga/tests/tb_min_max_tracker.v,
fpga/tests/tb_lf_edge_detect.v: New testbenches

fpga/tests/plot_edgedetect.py: New script to plot the results from
the edge detection tests.

fpga/tests/tb_data: New directory for data and golden outputs
2014-06-27 14:27:03 +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
ikarus e17437f985 Keep the PM3 code repo clean of website/wiki stuff. 2014-06-26 10:50:23 +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 fa57f6e12e fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice 2014-06-20 12:38:58 +02:00
iZsh 62638f87db armsrc/fpgaloader.c: forgot the copyright notice 2014-06-20 12:29:58 +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
penturalabs fecd8202a5 implemented 'hf iclass dump xxxx',
all you need is the magic key to dump contents of an iclass card
2014-06-17 10:55:37 +01: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 fa541aca96 Minor changes, it may actually work now, need to test with a credentialed reader 2014-06-07 22:16:57 +02:00
Martin Holst Swende 94ad01bfba Merged with head 2014-06-07 22:04:27 +02:00
Martin Holst Swende 81012e670b debug in progress 2014-06-07 22:00:31 +02:00
Martin Holst Swende e3dc1e4cf5 Minor changes in iclass.c 2014-06-07 21:49:56 +02:00
Martin Holst Swende 94090295a7 new fpga image for better iso15693 simulation 2014-06-07 21:44:45 +02:00
Martin Holst Swende 83fd67ba0b Added mode for 424k modulation (iso 15693) 2014-06-07 21:40:47 +02:00
Martin Holst Swende 12401d8dbc Added 424KHz mode for iso 15693 simulation 2014-06-07 21:39:52 +02:00
penturalabs fe53c0311c improved calc_iclass_mac to work independant of size 2014-05-02 23:30:03 +01:00
Andrew Davies a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00
Martin Holst Swende fdcd43eb15 Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands 2014-04-26 16:15:16 +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
Martin Holst Swende ff7bb4ef17 Experimenting with hacking iclass 2014-04-17 09:53:54 +02:00
penturalabs c3963755b7 Implement replay command. 2014-04-15 11:47:01 +01:00
Martin Holst Swende cba867f202 Final (?) fixes to git versioning https://github.com/Proxmark/proxmark3/issues/10 2014-04-04 20:14:58 +02:00
ikarus 7eb0f3d0ff Added lua, luac and proxmark3 (compieled binaries) to .gitignore. 2014-04-02 21:51:35 +02:00
ikarus 9c6837165b Updated nameing (svn -> git) & fixed whitespaces. 2014-04-02 21:46:25 +02:00
Martin Holst Swende 23ca86b833 Changed size of version info 2014-04-02 11:55:16 +02:00
Martin Holst Swende e3ac0d7095 Fixed so build scripts utilises the git version 2014-04-01 20:52:45 +02:00
Martin Holst Swende 07976a256d Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch 2014-03-31 17:57:14 +02:00
Martin Holst Swende 69d88ec463 Major refactoring of lfops, removed a lot of duplicate code 2014-03-30 15:59:54 +02:00
Martin Holst Swende 046f3dfa7c Merge pull request #9 from doegox/addhelpm
Merged Addhelp -h / Markdown help -m, it now does not crash on windows (http://www.proxmark.org/forum/viewtopic.php?pid=10461#p10461)
2014-03-28 12:27:38 +01:00
W8M2Hg9lLmWqXSGC 3193a13003 Wiki
Added sidebar.
2014-03-28 10:55:46 +11:00
W8M2Hg9lLmWqXSGC 714b462183 Wiki
Slowly updating the wiki.
Home and hardware pages.
2014-03-28 09:54:52 +11: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
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