github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/iceman1001/proxmark3

Browse source
This commit is contained in:
iceman1001 2017-03-09 10:26:16 +01:00
commit 7663c35c73
2 changed files with 7 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
## [1.7.0 iceman fork] [2017-03-07]
- hf mf dump - added retry loops to try each read attempt up to 3 times. makes getting a complete dump easier with many antennas. (marshmellow) - hf mf dump - added retry loops to try each read attempt up to 3 times. makes getting a complete dump easier with many antennas. (marshmellow)
- Added markers in the graph around found Sequence Terminator after askmandemod. (marshmellow) - Added markers in the graph around found Sequence Terminator after askmandemod. (marshmellow)
@ -26,7 +28,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added lf em 4x05info command to read and display information about the chip (marshmellow) - Added lf em 4x05info command to read and display information about the chip (marshmellow)
- `lf em4x em4x50***` refactoring of em4x50 commands. (iceman) - `lf em4x em4x50***` refactoring of em4x50 commands. (iceman)
## [1.6.9][icemanfork] [2017-02-06] ## [1.6.9 iceman fork] [2017-02-06]
- Serial speedup, if possible 408600baud otherwise default to 115200baud (iceman) - Serial speedup, if possible 408600baud otherwise default to 115200baud (iceman)
- `hf emv` - Added Peter Fillmore's EMV branch now compiles on iceman fork. See seperate issue. (iceman) - `hf emv` - Added Peter Fillmore's EMV branch now compiles on iceman fork. See seperate issue. (iceman)
- `hf 14a reader` - Aztek detection. (iceman) - `hf 14a reader` - Aztek detection. (iceman)
@ -42,7 +44,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- `hf iclass decrypt` - only decrypt Application1 (iceman) - `hf iclass decrypt` - only decrypt Application1 (iceman)
- `lf t55xx detect` - when finding multiple possible config blocks, see if a known configblock exists and select. (iceman) - `lf t55xx detect` - when finding multiple possible config blocks, see if a known configblock exists and select. (iceman)
## [1.6.7][icemanfork] [2017-01-05] ## [1.6.7 iceman fork] [2017-01-05]
- `lf animal` - FDX-B animal commands (iceman) - `lf animal` - FDX-B animal commands (iceman)
- Fixed bugs in `lf sim` and other lf continuous demods not turning off antenna when finished (marshmellow) - Fixed bugs in `lf sim` and other lf continuous demods not turning off antenna when finished (marshmellow)
- `hf iclass write` - fixed bugs, added crc. (?) - `hf iclass write` - fixed bugs, added crc. (?)

65
README.md
View file

@ -46,7 +46,7 @@ Among the stuff is
* other obscure patches like for the sammy-mode, (offline you know), tagidentifications, defaultkeys. * other obscure patches like for the sammy-mode, (offline you know), tagidentifications, defaultkeys.
* Minor textual changes here and there. * Minor textual changes here and there.
* Simulation of Ultralight/Ntag. * Simulation of Ultralight/Ntag.
* Marshmellow's and my "RevEng" addon for the client. Ref: http://reveng.sourceforge.net/ Now using reveng1.31 * Marshmellow's and my "RevEng" addon for the client. Ref: http://reveng.sourceforge.net/ Now using reveng1.44
* J-Run alternative bruteforce Mifare nested auths.. (you need one other exe to make it work) * J-Run alternative bruteforce Mifare nested auths.. (you need one other exe to make it work)
* A Bruteforce for T55XX passwords against tag. * 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 AWID 26, starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a AWID Reader.
@ -55,66 +55,6 @@ Among the stuff is
* Icsom's legic script and legic enhancements * Icsom's legic script and legic enhancements
* Aczid's bitsliced bruteforce solver in 'hf mf hardnested' * Aczid's bitsliced bruteforce solver in 'hf mf hardnested'
##Straight from the CHANGELOG
=============================
## [1.6.9][icemanfork] [2017-02-06]
- Serial speedup, if possible 408600baud otherwise default to 115200baud (iceman)
- `hf emv` - Added Peter Fillmore's EMV branch now compiles on iceman fork. See seperate issue. (iceman)
- `hf 14a reader` - Aztek detection. (iceman)
- `standalone mode` - added more detection of tags and refactored (iceman)
- `script run ufodump` - dumps an Aztek tag. (iceman)
- `script run hard_autopwn` - runs hardnested attack against all sectors on tag (iceman)
- Added lf cotag read, and added it to lf search (iceman)
- Added hitag2 read UID only and added that to lf search (marshmellow)
- `lf search` - check for if signal is only noice (marshmellow)
- `hf 14a reader` - fixed a bug when card has sak 0x00 but still is not UL/NTAG etc. (iceman)
- `hf mf sim` / `hf 14a sim` - use random nonce. (micolous)
- `hw tune` - only prints out if voltage is detected from antenna. (iceman)
- `hf iclass decrypt` - only decrypt Application1 (iceman)
- `lf t55xx detect` - when finding multiple possible config blocks, see if a known configblock exists and select. (iceman)
- Added `hf mf key_brute` - adds J-Runs 2nd phase bruteforce ref: https://github.com/J-Run/mf_key_brute (iceman)
- Added `lf jablotron` - adds demod/clone/sim of Jablotron LF tags. (iceman)
- Added `lf t55xx recoverpw` - adds a new password recovery using bitflips and partial flips if password write went bad. (alexgrin)
- `hf legic` - added improved legic data mapping. (jason)
- `hf mf mifare` - added possibility to target key A|B (douniwan5788)
- Added `analyse lcr` - added a new main command group, to help analysing bytes & bits & nibbles. (iceman)
- Added `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 project homepage (iceman)
- Updated the Reveng 1.31 sourcecode to 1.40 from Reveng project homepage (iceman)
- Added possibility to write direct to a Legic Prime Tag (MIM256/1024) without using values from the 'BigBuffer' -> 'hf legic writeRaw <addr> <value>' (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 <path/to/legic.dump>' & 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)
--- ---
##Why don't you merged with offical PM3 Master? ##Why don't you merged with offical PM3 Master?
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. 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.
@ -130,7 +70,8 @@ I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will
This fork now compiles just fine on This fork now compiles just fine on
- Windows/mingw environment with Qt5.6.1 & GCC 4.8 - Windows/mingw environment with Qt5.6.1 & GCC 4.8
- Ubuntu 1404, 1510, 1604 - Ubuntu 1404, 1510, 1604
- Mac OS X - Mac OS X / Homebrew
- Docker container
##Setup and build for UBUNTU ##Setup and build for UBUNTU
GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04