]>
git.zerfleddert.de Git - proxmark3-svn/log
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 [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
roel@libnfc.org [Fri, 11 Oct 2013 08:43:23 +0000 (08:43 +0000)]
integrated MIFARE ultralight features, contributed by 'midnitesnake'
roel@libnfc.org [Fri, 11 Oct 2013 08:37:08 +0000 (08:37 +0000)]
with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer.
martin.holst@gmail.com [Wed, 9 Oct 2013 19:37:55 +0000 (19:37 +0000)]
Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest
martin.holst@gmail.com [Wed, 9 Oct 2013 19:08:17 +0000 (19:08 +0000)]
Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494
roel@libnfc.org [Wed, 9 Oct 2013 09:59:14 +0000 (09:59 +0000)]
removed unused compiler directives, cleaned up some code
martin.holst@gmail.com [Tue, 8 Oct 2013 18:50:54 +0000 (18:50 +0000)]
Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html
martin.holst@gmail.com [Tue, 8 Oct 2013 18:30:01 +0000 (18:30 +0000)]
Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details.
martin.holst@gmail.com [Mon, 7 Oct 2013 10:11:15 +0000 (10:11 +0000)]
Added nonce2key-API to lua
martin.holst@gmail.com [Mon, 7 Oct 2013 10:10:34 +0000 (10:10 +0000)]
Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times
martin.holst@gmail.com [Mon, 7 Oct 2013 10:02:25 +0000 (10:02 +0000)]
Removed double print-out
fnargwibble@gmail.com [Sat, 5 Oct 2013 16:55:53 +0000 (16:55 +0000)]
i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh.
fnargwibble@gmail.com [Sat, 5 Oct 2013 16:44:48 +0000 (16:44 +0000)]
show device name during flashing and change advice on hanging
martin.holst@gmail.com [Fri, 4 Oct 2013 19:29:46 +0000 (19:29 +0000)]
Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a
ffffffffffff ') in order to execute anything via the old command line parser
jonor@live.it [Fri, 4 Oct 2013 18:54:10 +0000 (18:54 +0000)]
Added more informations at command hw version. Now we can get some informations of microcontroller.
Maybe is useful when someone got a bigger AT91
Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at 9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory
martin.holst@gmail.com [Fri, 4 Oct 2013 18:47:38 +0000 (18:47 +0000)]
Minor issue, usability
roel@libnfc.org [Thu, 3 Oct 2013 14:52:21 +0000 (14:52 +0000)]
fixed some more compiler warnings
roel@libnfc.org [Thu, 3 Oct 2013 14:36:42 +0000 (14:36 +0000)]
fixed compiler warnings
roel@libnfc.org [Thu, 3 Oct 2013 14:22:43 +0000 (14:22 +0000)]
fixed iso14443a-4 similation, got rid of many ugly memory allocation issues
martin.holst@gmail.com [Thu, 3 Oct 2013 13:58:14 +0000 (13:58 +0000)]
Some documentation improvement
martin.holst@gmail.com [Thu, 3 Oct 2013 13:56:11 +0000 (13:56 +0000)]
Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ?
martin.holst@gmail.com [Thu, 3 Oct 2013 13:26:17 +0000 (13:26 +0000)]
Fixed error in htmldumper
martin.holst@gmail.com [Thu, 3 Oct 2013 12:34:28 +0000 (12:34 +0000)]
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2
martin.holst@gmail.com [Thu, 3 Oct 2013 12:33:58 +0000 (12:33 +0000)]
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone
martin.holst@gmail.com [Tue, 1 Oct 2013 19:58:42 +0000 (19:58 +0000)]
Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file
jonor@live.it [Mon, 30 Sep 2013 19:08:29 +0000 (19:08 +0000)]
Correct issue of blew circular buffer in hf 14b snoop with gcc 4.7.4 the issue is solved
douniwan5788@gmail.com [Sun, 29 Sep 2013 11:44:07 +0000 (11:44 +0000)]
Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK.
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
martin.holst@gmail.com [Sat, 28 Sep 2013 20:07:28 +0000 (20:07 +0000)]
Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details
martin.holst@gmail.com [Sat, 28 Sep 2013 19:28:55 +0000 (19:28 +0000)]
Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info
henryk@ploetzli.ch [Fri, 27 Sep 2013 13:48:20 +0000 (13:48 +0000)]
* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.
roel@libnfc.org [Wed, 25 Sep 2013 10:40:16 +0000 (10:40 +0000)]
fixed warnings on Mac OS 10.8, xcode 5
martin.holst@gmail.com [Sat, 21 Sep 2013 20:46:32 +0000 (20:46 +0000)]
Minor changes, usage examples and selftests
martin.holst@gmail.com [Sat, 21 Sep 2013 20:40:32 +0000 (20:40 +0000)]
Changed the name of writeraw into 14araw
martin.holst@gmail.com [Sat, 21 Sep 2013 20:37:22 +0000 (20:37 +0000)]
Fixed the write raw 14a, now finally functional... at least let's hope so
martin.holst@gmail.com [Fri, 20 Sep 2013 10:11:17 +0000 (10:11 +0000)]
Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others...
martin.holst@gmail.com [Fri, 20 Sep 2013 07:32:37 +0000 (07:32 +0000)]
Fix two errors in writeraw (14a)-script that were found by jonor
martin.holst@gmail.com [Thu, 19 Sep 2013 20:01:07 +0000 (20:01 +0000)]
Reintegrated scripting-branch into trunk. yay
martin.holst@gmail.com [Thu, 19 Sep 2013 19:55:28 +0000 (19:55 +0000)]
Final merge of trunk changes to scripting branch
martin.holst@gmail.com [Thu, 19 Sep 2013 19:53:09 +0000 (19:53 +0000)]
Only superficial changes, to get rid of compiler warnings
martin.holst@gmail.com [Thu, 19 Sep 2013 19:33:56 +0000 (19:33 +0000)]
Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw)
martin.holst@gmail.com [Thu, 19 Sep 2013 19:21:12 +0000 (19:21 +0000)]
Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters
martin.holst@gmail.com [Mon, 16 Sep 2013 19:08:19 +0000 (19:08 +0000)]
merged trunk changes into branch