X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2f5436ff0d860267c3f5419ac218da474dff64f1..cfcc826a9bf48f28541284aa13f16c5749486512:/README.txt?ds=sidebyside

diff --git a/README.txt b/README.txt
index 81bd7720..077ff0f6 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,6 @@
 The iceman fork
 ---------------
+
 NOTICE: 
 
 The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3
@@ -9,12 +10,20 @@ NEWS:
 ::THIS FORK IS HIGHLY EXPERIMENTAL::
 
 
+## 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)
+
+
 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. 
 Among the stuff is
 
 	* Jonor's hf 14a raw timing patch
 	* Piwi's updates. (usually gets into the master)
-	* Piwi's "topaz" branch (not merged)
+	* Piwi's "topaz" branch
+	* Piwi's "hardnested" branch 
 	* Holiman's iclass, (usually gets into the master)
 	* Marshmellow's fixes (usually gets into the master)
 	* Midnitesnake's Ultralight,  Ultralight-c enhancements
@@ -25,8 +34,11 @@ Among the stuff is
 	* Minor textual changes here and there.
 	* Simulation of Ultralight/Ntag.
 	* Marshmellow's and my "RevEng" addon for the client.  Ref: http://reveng.sourceforge.net/
-	* Someone's alterantive bruteforce Mifare changes.. (you need the two other exe to make it work)
-	* 
+	* 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.
+
 	
 Give me a hint, and I'll see if I can't merge in the stuff you have. 
 
@@ -48,7 +60,7 @@ GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS.
 	- Generally speaking, if you're running a "later" Proxmark, installation is very easy.
 	- Run "sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget"a
 	- Follow these instructions
-Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
+Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
 
 (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
@@ -96,8 +108,8 @@ iceman at host iuse.se
 The Proxmark 3 is available for purchase (assembled and tested) from the
 following locations:
 
-   * http://proxmark3.com/
-   * http://www.xfpga.com/
+   * http://www.elechouse.com  (new and revised hardware package 2015)
+   
 
 Most of the ultra-low-volume contract assemblers could put
 something like this together with a reasonable yield. A run of around