X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/eb891c385e5b580dfafbe3f1ffbae41054adbdd9..3e134b4c20a5528b8264cd87d3fdebd0b2df6fd9:/README.md?ds=sidebyside diff --git a/README.md b/README.md index 2c02d0ef..7f3b327d 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,16 @@ The iceman fork ---------------- +=============== +[![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3) [![Coverity Status](https://scan.coverity.com/projects/5117/badge.svg)](https://scan.coverity.com/projects/proxmark3-iceman-fork) [![Latest release] (https://img.shields.io/github/release/iceman1001/proxmark3.svg)] (https://github.com/iceman1001/proxmark3/releases/latest) -NOTICE: +##This fork is HIGHLY experimental -::THIS FORK IS HIGHLY EXPERIMENTAL:: +##Notice +There is so much in this fork, with all fixes and additions its basically the most enhanced fork to this day for the Proxmark3 device. +##Offical The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3 -NEWS: - -## Build Status Travis CI -[![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3) - -## Build Status Coverity Scan -[![Coverity Scan Build Status](https://scan.coverity.com/projects/5117/badge.svg)](https://scan.coverity.com/projects/proxmark3-iceman-fork) - - -## Coverity Scan Config && Run - +##Coverity Scan Config & Run Download the Coverity Scan Self-buld and install it. You will need to configure ARM-NON-EABI- Compiler for it to use: @@ -32,9 +25,8 @@ tar czvf proxmark3.tgz cov-int :: upload it to coverity.com -## Whats changed? - -Whats in this fork? I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. +##Whats changed? +Whats so special with this fork? I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. Among the stuff is * Jonor's hf 14a raw timing patch @@ -50,36 +42,69 @@ Among the stuff is * other obscure patches like for the sammy-mode, (offline you know), tagidentifications, defaultkeys. * Minor textual changes here and there. * Simulation of Ultralight/Ntag. - * Marshmellow's and my "RevEng" addon for the client. Ref: http://reveng.sourceforge.net/ + * Marshmellow's and my "RevEng" addon for the client. Ref: http://reveng.sourceforge.net/ Now using reveng1.31 * Someone's alternative bruteforce Mifare changes.. (you need the two other exe to make it work) * A Bruteforce for T55XX passwords against tag. * A Bruteforce for AWID 26, starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a AWID Reader. * A Bruteforce for HID, starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a HID Reader. * Blaposts Crapto1 v3.3 - - * icsom's legic script and legic enhancements + * Icsom's legic script and legic enhancements + * Aczid's bitsliced bruteforce solver in 'hf mf hardnested' + +##Straight from the CHANGELOG +============================= + - 'analyse lcr' - added a new main command group, to help analysing bytes & bits & nibbles. (iceman) + - 'lf nedap' - added identification of a NEDAP tag. (iceman) + - 'lf viking clone' - fixed a bug. (iceman) + - Added bitsliced bruteforce solver in 'hf mf hardnested' (aczid) + - 'hf mf chk' speedup (iceman) + - 'hf 14a/mf sim x" attack mode, now uses also moebius version of mfkey32 to try finding the key. (iceman) + - 'hf 14a sim' Added emulation of Mifare cards with 10byte UID length. (iceman) + - 'hf mf sim' Added emulation of Mifare cards with 10byte UID length. (iceman) + - Added `lf guard clone/sim` (iceman) + - Added `lf pyramd clone/sim` (iceman) + - trying to fix "hf 14b" command to be able to read CALYPSO card. (iceman) + - `hf legic load`, it now loads faster and a casting bug is gone. (iceman) + - Added `hf legic calccrc8` added a method to calculate the legic crc-8 value (iceman) + - `hf legic decode` fixed the output overflow bugs, better printing (iceman) + - Coverity Scan fixes a lot of resource leaks, etc (iceman) + - Added `lf presco *` commands started (iceman) + - Added `lf hid wiegand` added a method to calculate WIEGAND in different formats, (iceman) + - `hf mf chkkeys` better printing, same table output as nested, faster execution and added Adam Lauries "try to read Key B if Key A is found" (iceman) + - `hf mf nested` better printing and added Adam Lauries "try to read Key B if Key A is found" (iceman) + - `hf mf mifare` fixing the zero parity path, which doesn't got called. (iceman) + - Updated the @blapost's Crapto1 implementation to v3.3 (blapost) + - `hf mf c*` updated the calling structure and refactored of the chinese magic commands (iceman, marshmellow) + - Started to add Peter Fillmore's EMV fork into Iceman fork. ref: https://github.com/peterfillmore/proxmark3 (peter fillmore, iceman) + - Added Travis-CI automatic build integration with GitHub fork. (iceman) + - Updated the Reveng 1.30 sourcecode to 1.31 from Reveng projecthomepage (iceman) + + - Added possibility to write direct to a Legic Prime Tag (MIM256/1024) without using values from the 'BigBuffer' -> 'hf legic writeRaw ' (icsom) + - Added possibility to decrease DCF values at address 0x05 & 0x06 on a Legic Prime Tag + DCF-value will be pulled from the BigBuffer (address 0x05 & 0x06) so you have to + load the data into the BigBuffer before with 'hf legic load ' & then + write the DCF-Values (both at once) with 'hf legic write 0x05 0x02' (icsom) + - Added script `legic.lua` for display and edit Data of Legic-Prime Tags (icsom) + - Added the experimental HITAG_S support (spenneb) + - Added topaz detection to `hf search` (iceman) + - Fixed the silent mode for 14b to be used inside 'hf search' (iceman) +--- Give me a hint, and I'll see if I can't merge in the stuff you have. I don't actually know how to make small pull-request to github :( and that is the number one reason for me not pushing a lot of things back to the PM3 master. -PM3 GUI: --------- +##PM3 GUI I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so well. *sorry* - - -DEVELOPMENT: ------------- +##Development This fork now compiles just fine on - windows/mingw environment with Qt5.3.1 & GCC 4.8 - Ubuntuu 1404, 1510 - Mac OS X - -SETUP AND BUILD FOR UBUNTU --------------------------- + - Windows/mingw environment with Qt5.3.1 & GCC 4.8 + - Ubuntuu 1404, 1510 + - Mac OS X (or before the hardnested BF solver at least) +##Setup and build for UBUNTU GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS or 15.10 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux @@ -128,21 +153,47 @@ Change into the client folder. Run the client -> ./proxmark3 /dev/ttyACM0 +##Homebrew (Mac OS X) +These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from. +Further questions about Mac & Homebrew, contact @Chrisfu (https://github.com/chrisfu/) -January 2015, Sweden -iceman at host iuse.se +1. Install homebrew if you haven't yet already done so: http://brew.sh/ + +2. Tap this repo: `brew tap iceman1001/proxmark3` -BUYING A PROXMARK 3 -------------------- +3. Install Proxmark3: `brew install proxmark3` for stable release or `brew install --HEAD proxmark3` for latest non-stable from GitHub. +##Docker container +I recently added a docker container on Docker HUB. You find it here: https://hub.docker.com/r/iceman1001/proxmark3/ +Follow those instructions to get it up and running. No need for the old proxspace-environment anymore. + +[1.6.0] How to start: https://www.youtube.com/watch?v=b5Zta89Cf6Q +[1.6.0] How to connect: https://youtu.be/0ZS2t5C-caI +[1.6.1] How to flash: https://www.youtube.com/watch?v=WXouhuGYEiw + +Recommendations: +Use only container tag [1.6.1] + + +##Buying a proxmark3 The Proxmark 3 device is available for purchase (assembled and tested) from the following locations: - * http://www.elechouse.com (new and revised hardware package 2015) + * http://proxmark3.tictail.com/ (For buyers in EU, most likely in Sweden) + + * http://www.elechouse.com/ (new and revised hardware package 2015, located in China) I recommend you to buy this version. --------------------------------------------------------------------------- +##Enjoy + +January 2015, Sweden +iceman at host iuse.se + + + + +##Note from Jonathan Westhues Most of the ultra-low-volume contract assemblers could put something like this together with a reasonable yield. A run of around a dozen units is probably cost-effective. The BOM includes (possibly-