textual changes.

diff --git a/README.md b/README.md
index 5667fc34cf1a36fa1814e6dea097203c58329052..29e3cb1ff5a99932eff282c2a259036c343d6f4f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@ Download the Coverity Scan Self-buld and install it.
 You will need to configure  ARM-NON-EABI- Compiler for it to use:
 
 :: Configure
 You will need to configure  ARM-NON-EABI- Compiler for it to use:
 
 :: Configure

-cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc
+`cov-configure --comptype gcc --compiler  /opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc`

 
 ::run it (I'm running on Ubuntu)
 
 ::run it (I'm running on Ubuntu)

-cov-build --dir cov-int make all
+`cov-build --dir cov-int make all`

 
 :: make a tarball
 
 :: make a tarball

-tar czvf proxmark3.tgz cov-int
+`tar czvf proxmark3.tgz cov-int`

 
 :: upload it to coverity.com
 
 
 :: upload it to coverity.com
 


@@ -43,14 +43,13 @@ 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/    Now using reveng1.31
        * Minor textual changes here and there.
        * Simulation of Ultralight/Ntag.
        * 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)
-
+       * 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 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
        * 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
-        * Aczid's bitsliced bruteforce solver in 'hf mf hardnested'
+    * Icsom's  legic script and legic enhancements
+    * Aczid's bitsliced bruteforce solver in 'hf mf hardnested'

 
 ##Straight from the CHANGELOG
 =============================
 
 ##Straight from the CHANGELOG
 =============================


@@ -95,7 +94,6 @@ Among the stuff is
   - 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)
   - 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. 
        
 ---    
 Give me a hint, and I'll see if I can't merge in the stuff you have. 


@@ -116,7 +114,7 @@ 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
 
 Run 
 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
 
 Run 

-       -> sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev
+        `sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev`

        
 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):
        
 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):


@@ -125,40 +123,40 @@ Get devkitARM release 41 from SourceForge (choose either the 64/32 bit depending
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
 
 Extract the contents of the .tar.bz2:
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
 
 Extract the contents of the .tar.bz2:

-       ->  tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
+       `tar jxvf devkitARM_r41-<arch>-linux.tar.bz2`

 
 Create a directory for the arm dev kit:
 
 Create a directory for the arm dev kit:

-       ->  sudo mkdir -p /opt/devkitpro/
+       `sudo mkdir -p /opt/devkitpro/`

 
 Move the ARM developer kit to the newly created directory:
 
 Move the ARM developer kit to the newly created directory:

-       -> sudo mv devkitARM /opt/devkitpro/
+       `sudo mv devkitARM /opt/devkitpro/`

 
 Add the appropriate environment variable:
 
 Add the appropriate environment variable:

-       -> export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
+       `export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/`

 
 Add the environment variable to your profile:
 
 Add the environment variable to your profile:

-       -> echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
+       `echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc`

 
 Clone iceman fork
 
 Clone iceman fork

-       -> git clone https://github.com/iceman1001/proxmark3.git
+       `git clone https://github.com/iceman1001/proxmark3.git`

 
 Get the latest commits 
 
 Get the latest commits 

-       -> git pull
+       `git pull`

 
 CLEAN COMPILE  
 
 CLEAN COMPILE  

-       -> make clean && make all
+       `make clean && make all`

        
 Flash the BOOTROM
        
 Flash the BOOTROM

-       -> client/flasher -b /dev/ttyACM0 bootrom/obj/bootrom.elf
+       `client/flasher /dev/ttyACM0 -b bootrom/obj/bootrom.elf`

 
 Flash the FULLIMAGE    
 
 Flash the FULLIMAGE    

-       -> client/flasher /dev/ttyACM0 armsrc/obj/fullimage.elf
+       `client/flasher /dev/ttyACM0 armsrc/obj/fullimage.elf`

        
 Change into the client folder.         
        
 Change into the client folder.         

-       -> cd client
+       `cd client`

        
 Run the client 
        
 Run the client 

-       -> ./proxmark3 /dev/ttyACM0
+       `./proxmark3 /dev/ttyACM0`

                                                   
 ##Homebrew (Mac OS X)
 These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.
                                                   
 ##Homebrew (Mac OS X)
 These instructions comes from @Chrisfu, where I got the proxmark3.rb scriptfile from.


@@ -179,7 +177,7 @@ Follow those instructions to get it up and running.  No need for the old proxspa
 [1.6.1] How to flash:   https://www.youtube.com/watch?v=WXouhuGYEiw
 
 Recommendations:
 [1.6.1] How to flash:   https://www.youtube.com/watch?v=WXouhuGYEiw
 
 Recommendations:

-Use only container tag [1.6.1]
+Use only container tag [1.6.4]

 
 
 ##Buying a proxmark3
 
 
 ##Buying a proxmark3


@@ -189,8 +187,6 @@ The Proxmark 3 device is available for purchase (assembled and tested) from the
  
    * http://www.elechouse.com/  (new and revised hardware package 2015, located in China)  
 
  
    * http://www.elechouse.com/  (new and revised hardware package 2015, located in China)  
 

-   I recommend you to buy this version. 
-

 
 ##Enjoy
 
 
 ##Enjoy
 

diff --git a/README.txt b/README.txt
index aad5d437798172eb8f44474e2c10e203fbc58851..ec921838ceb7bc15a03bd77a5e026b9de143853a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@ NEWS:
 [![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3)
 
 ## Build Status Coverity Scan
 [![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 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. 
 
 
 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. 


@@ -56,9 +56,8 @@ I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.9
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.9

-For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.

 
 

-GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS.
+GC made updates to allow this to build easily on Ubuntu 14.04

        - See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
        - 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 libncurses5-dev
        - See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
        - 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 libncurses5-dev


@@ -110,7 +109,11 @@ iceman at host iuse.se
 The Proxmark 3 is available for purchase (assembled and tested) from the
 following locations:
 
 The Proxmark 3 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)  
+
+

    
 
 Most of the ultra-low-volume contract assemblers could put
    
 
 Most of the ultra-low-volume contract assemblers could put