]>
cvs.zerfleddert.de Git - proxmark3-svn/log
Martin Holst Swende [Sun, 29 Jun 2014 11:52:05 +0000 (13:52 +0200)]
Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research
Martin Holst Swende [Sun, 29 Jun 2014 11:48:13 +0000 (13:48 +0200)]
Minor
Midnitesnake [Sun, 29 Jun 2014 08:25:31 +0000 (09:25 +0100)]
Changes inorder for iclass dump to work correctly
Martin Holst Swende [Sat, 28 Jun 2014 20:57:48 +0000 (22:57 +0200)]
Some minor changes [iclass-related]
Martin Holst Swende [Sat, 28 Jun 2014 18:52:37 +0000 (20:52 +0200)]
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
Martin Holst Swende [Sat, 28 Jun 2014 10:50:09 +0000 (12:50 +0200)]
Merge pull request #17 from Proxmark/iclass-fixes
Iclass fixes
Martin Holst Swende [Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/master' into iclass-fixes
iZsh [Fri, 27 Jun 2014 21:28:56 +0000 (23:28 +0200)]
fpga/min_max_tracker.v: english
pwpiwi [Fri, 27 Jun 2014 17:23:42 +0000 (19:23 +0200)]
git housekeeping:
- added *.log files to .gitignore
- new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files
iZsh [Sat, 21 Jun 2014 22:26:38 +0000 (00:26 +0200)]
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
Martin Holst Swende [Fri, 27 Jun 2014 11:16:31 +0000 (13:16 +0200)]
Merged with master
Martin Holst Swende [Fri, 27 Jun 2014 10:52:28 +0000 (12:52 +0200)]
fix for better csns
ikarus [Thu, 26 Jun 2014 08:50:23 +0000 (10:50 +0200)]
Keep the PM3 code repo clean of website/wiki stuff.
pwpiwi [Thu, 26 Jun 2014 05:57:49 +0000 (07:57 +0200)]
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
iZsh [Sat, 21 Jun 2014 19:33:54 +0000 (21:33 +0200)]
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.
iZsh [Fri, 20 Jun 2014 10:38:58 +0000 (12:38 +0200)]
fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice
iZsh [Fri, 20 Jun 2014 10:29:58 +0000 (12:29 +0200)]
armsrc/fpgaloader.c: forgot the copyright notice
iZsh [Thu, 19 Jun 2014 23:02:59 +0000 (01:02 +0200)]
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.
penturalabs [Tue, 17 Jun 2014 09:55:37 +0000 (10:55 +0100)]
implemented 'hf iclass dump xxxx',
all you need is the magic key to dump contents of an iclass card
Martin Holst Swende [Mon, 16 Jun 2014 19:27:12 +0000 (21:27 +0200)]
More work on iclass simulation attack
Martin Holst Swende [Wed, 11 Jun 2014 06:42:37 +0000 (08:42 +0200)]
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577
Martin Holst Swende [Sat, 7 Jun 2014 20:16:57 +0000 (22:16 +0200)]
Minor changes, it may actually work now, need to test with a credentialed reader
Martin Holst Swende [Sat, 7 Jun 2014 20:04:27 +0000 (22:04 +0200)]
Merged with head
Martin Holst Swende [Sat, 7 Jun 2014 20:00:31 +0000 (22:00 +0200)]
debug in progress
Martin Holst Swende [Sat, 7 Jun 2014 19:49:56 +0000 (21:49 +0200)]
Minor changes in iclass.c
Martin Holst Swende [Sat, 7 Jun 2014 19:44:45 +0000 (21:44 +0200)]
new fpga image for better iso15693 simulation
Martin Holst Swende [Sat, 7 Jun 2014 19:40:47 +0000 (21:40 +0200)]
Added mode for 424k modulation (iso 15693)
Martin Holst Swende [Sat, 7 Jun 2014 19:39:52 +0000 (21:39 +0200)]
Added 424KHz mode for iso 15693 simulation
penturalabs [Fri, 2 May 2014 22:30:03 +0000 (23:30 +0100)]
improved calc_iclass_mac to work independant of size
Andrew Davies [Fri, 2 May 2014 10:11:54 +0000 (11:11 +0100)]
Updated proxmark research with Holiman's loclass framework
Martin Holst Swende [Sat, 26 Apr 2014 14:15:16 +0000 (16:15 +0200)]
Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands
Martin Holst Swende [Thu, 24 Apr 2014 13:48:00 +0000 (15:48 +0200)]
More work on iclass
Martin Holst Swende [Thu, 24 Apr 2014 12:13:33 +0000 (14:13 +0200)]
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
Martin Holst Swende [Thu, 17 Apr 2014 07:53:54 +0000 (09:53 +0200)]
Experimenting with hacking iclass
penturalabs [Tue, 15 Apr 2014 10:47:01 +0000 (11:47 +0100)]
Implement replay command.
Martin Holst Swende [Fri, 4 Apr 2014 18:14:58 +0000 (20:14 +0200)]
Final (?) fixes to git versioning https://github.com/Proxmark/proxmark3/issues/10
ikarus [Wed, 2 Apr 2014 19:51:35 +0000 (21:51 +0200)]
Added lua, luac and proxmark3 (compieled binaries) to .gitignore.
ikarus [Wed, 2 Apr 2014 19:46:25 +0000 (21:46 +0200)]
Updated nameing (svn -> git) & fixed whitespaces.
Martin Holst Swende [Wed, 2 Apr 2014 09:55:16 +0000 (11:55 +0200)]
Changed size of version info
Martin Holst Swende [Tue, 1 Apr 2014 18:52:45 +0000 (20:52 +0200)]
Fixed so build scripts utilises the git version
Martin Holst Swende [Mon, 31 Mar 2014 15:57:14 +0000 (17:57 +0200)]
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
Martin Holst Swende [Sun, 30 Mar 2014 13:59:54 +0000 (15:59 +0200)]
Major refactoring of lfops, removed a lot of duplicate code
Martin Holst Swende [Fri, 28 Mar 2014 11:27:38 +0000 (12:27 +0100)]
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)
W8M2Hg9lLmWqXSGC [Thu, 27 Mar 2014 23:55:46 +0000 (10:55 +1100)]
Wiki
Added sidebar.
W8M2Hg9lLmWqXSGC [Thu, 27 Mar 2014 22:54:38 +0000 (09:54 +1100)]
Wiki
Slowly updating the wiki.
Home and hardware pages.
Philippe Teuwen [Thu, 27 Mar 2014 15:49:37 +0000 (16:49 +0100)]
Markdown help: use fixed column width
Philippe Teuwen [Wed, 26 Mar 2014 22:51:22 +0000 (23:51 +0100)]
Restore original inline help behavior as we've now separate fcts for -h/-m
Philippe Teuwen [Wed, 26 Mar 2014 22:35:53 +0000 (23:35 +0100)]
Provide option -m for markdown help dump, -h for text dump
Philippe Teuwen [Wed, 26 Mar 2014 21:44:25 +0000 (22:44 +0100)]
Fix description in help dump
Philippe Teuwen [Wed, 26 Mar 2014 21:29:41 +0000 (22:29 +0100)]
Fix offline column in help dump
Martin Holst Swende [Wed, 26 Mar 2014 21:35:25 +0000 (22:35 +0100)]
Fixes to implement generation of markdown auto-generated documentation
Philippe Teuwen [Wed, 26 Mar 2014 21:08:55 +0000 (22:08 +0100)]
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
W8M2Hg9lLmWqXSGC [Wed, 26 Mar 2014 04:12:32 +0000 (15:12 +1100)]
Update README.txt
Removed old information.
holiman [Tue, 25 Mar 2014 20:49:05 +0000 (21:49 +0100)]
Merge pull request #8 from pwpiwi/master
add .gitignore and merge svn r852
pwpiwi [Tue, 25 Mar 2014 20:38:24 +0000 (21:38 +0100)]
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
pwpiwi [Tue, 25 Mar 2014 20:31:37 +0000 (21:31 +0100)]
Provide .gitignore to prevent unwanted files to be committed
W8M2Hg9lLmWqXSGC [Mon, 24 Mar 2014 20:07:48 +0000 (07:07 +1100)]
Merge pull request #7 from PenturaLabs/master
Re-submitting Midnitesnake's Mifare Ultralight Patch
W8M2Hg9lLmWqXSGC [Fri, 21 Mar 2014 09:35:14 +0000 (20:35 +1100)]
Merge pull request #5 from PenturaLabs/master
Kantech ioProx Support - Fix
PenturaLabs [Fri, 21 Mar 2014 07:51:51 +0000 (07:51 +0000)]
Update cmdlfio.h
penturalabs [Fri, 21 Mar 2014 07:45:18 +0000 (07:45 +0000)]
Sorry, included missing files from last pull request
W8M2Hg9lLmWqXSGC [Tue, 18 Mar 2014 21:47:28 +0000 (08:47 +1100)]
Merge pull request #2 from PenturaLabs/master
Added Kantech ioProx Support
W8M2Hg9lLmWqXSGC [Tue, 18 Mar 2014 21:46:04 +0000 (08:46 +1100)]
Merge pull request #1 from midnitesnake/master
Unique Tag Support
penturalabs [Tue, 18 Mar 2014 20:52:48 +0000 (20:52 +0000)]
Added Kantech ioProx Support
PenturaLabs [Tue, 18 Mar 2014 14:02:32 +0000 (14:02 +0000)]
Re-submitting Midnitesnake's Mifare Ultralight Patch
midnitesnake [Tue, 18 Mar 2014 07:42:54 +0000 (07:42 +0000)]
Added Unique Code to EM41x
midnitesnake [Tue, 18 Mar 2014 07:41:02 +0000 (07:41 +0000)]
Added Unique Code to EM41x
W8M2Hg9lLmWqXSGC [Mon, 17 Mar 2014 04:41:33 +0000 (15:41 +1100)]
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.
martin.holst@gmail.com [Thu, 27 Feb 2014 18:10:12 +0000 (18:10 +0000)]
Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info
micki.held@gmx.de [Tue, 25 Feb 2014 06:49:49 +0000 (06:49 +0000)]
iso14444a: minor FPGA bugfix
micki.held@gmx.de [Sun, 23 Feb 2014 15:46:19 +0000 (15:46 +0000)]
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.
micki.held@gmx.de [Wed, 19 Feb 2014 20:35:04 +0000 (20:35 +0000)]
- 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
martin.holst@gmail.com [Wed, 5 Feb 2014 18:53:55 +0000 (18:53 +0000)]
reverted a non-intended commit with crappy debug printouts
martin.holst@gmail.com [Wed, 5 Feb 2014 08:07:27 +0000 (08:07 +0000)]
Fixed error with ar/nr-collection
martin.holst@gmail.com [Fri, 31 Jan 2014 21:24:18 +0000 (21:24 +0000)]
Minor typo
martin.holst@gmail.com [Fri, 31 Jan 2014 21:17:34 +0000 (21:17 +0000)]
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
martin.holst@gmail.com [Wed, 22 Jan 2014 08:49:28 +0000 (08:49 +0000)]
Fixed (?) issue with mifare simulation auth failed. See http://www.proxmark.org/forum/viewtopic.php?pid=9192#p9192
micki.held@gmx.de [Tue, 19 Nov 2013 18:52:40 +0000 (18:52 +0000)]
- 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
martin.holst@gmail.com [Thu, 7 Nov 2013 11:33:48 +0000 (11:33 +0000)]
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
martin.holst@gmail.com [Thu, 7 Nov 2013 11:32:13 +0000 (11:32 +0000)]
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
martin.holst@gmail.com [Wed, 6 Nov 2013 18:34:10 +0000 (18:34 +0000)]
Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation
martin.holst@gmail.com [Wed, 6 Nov 2013 18:32:11 +0000 (18:32 +0000)]
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
martin.holst@gmail.com [Thu, 31 Oct 2013 18:24:03 +0000 (18:24 +0000)]
Minor fix in html skeleton
martin.holst@gmail.com [Thu, 31 Oct 2013 10:35:03 +0000 (10:35 +0000)]
Some more tinkering with a generic 13.56MHz reader, still not finished
martin.holst@gmail.com [Wed, 30 Oct 2013 21:10:47 +0000 (21:10 +0000)]
First steps towards creating a generic HF reader/identifier. A coop with Asper.
martin.holst@gmail.com [Wed, 30 Oct 2013 18:21:42 +0000 (18:21 +0000)]
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
dn337t@gmail.com [Tue, 22 Oct 2013 12:14:32 +0000 (12:14 +0000)]
use CLOCKS_PER_SEC instead of platform-specific hardcoded value
martin.holst@gmail.com [Sun, 20 Oct 2013 19:05:52 +0000 (19:05 +0000)]
Fixed linebreak error
martin.holst@gmail.com [Sun, 20 Oct 2013 18:51:21 +0000 (18:51 +0000)]
Added functionality to dump data into .eml-file
martin.holst@gmail.com [Sun, 20 Oct 2013 18:48:04 +0000 (18:48 +0000)]
Script to convert emulator file (ASCII dump of data) into HTML
martin.holst@gmail.com [Sun, 20 Oct 2013 18:47:15 +0000 (18:47 +0000)]
Fixed minor errors
izsh@fail0verflow.com [Sun, 20 Oct 2013 11:46:51 +0000 (11:46 +0000)]
cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p')
izsh@fail0verflow.com [Sun, 20 Oct 2013 11:40:00 +0000 (11:40 +0000)]
fix compilation issues with gcc 4.6: anonymous unions are not c99
martin.holst@gmail.com [Sat, 19 Oct 2013 20:18:50 +0000 (20:18 +0000)]
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
martin.holst@gmail.com [Fri, 18 Oct 2013 11:35:06 +0000 (11:35 +0000)]
Minor change
martin.holst@gmail.com [Fri, 18 Oct 2013 11:14:23 +0000 (11:14 +0000)]
Added script to dump ndef-compliant tags. Written in collaboration with @asper
martin.holst@gmail.com [Fri, 18 Oct 2013 07:36:20 +0000 (07:36 +0000)]
Put manufacturer country within brackets
martin.holst@gmail.com [Thu, 17 Oct 2013 19:21:04 +0000 (19:21 +0000)]
Some refactoring, also placed wait14443a here
martin.holst@gmail.com [Thu, 17 Oct 2013 19:20:10 +0000 (19:20 +0000)]
Manufacturer-info, to be used in upcoming script
martin.holst@gmail.com [Thu, 17 Oct 2013 18:28:21 +0000 (18:28 +0000)]
Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576
fnargwibble@gmail.com [Fri, 11 Oct 2013 09:15:05 +0000 (09:15 +0000)]
add linux modem manager de-confliction file