Merge pull request #315 from marshmellow42/master

fix compile issues on OS X 10.11

diff --git a/.gitignore b/.gitignore
index ca07dc1264061e7d60c5a9d8628c3cc5fdbd491c..52a9b55bb496fd9e7494e20d5b2180282f1fd0a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.map
 *.bin
 !client/hardnested/*.bin
+!client/hardnested/tables/*.bin
 *.dll
 *.moc.cpp
 *.z

diff --git a/README.txt b/README.txt
index bb4dceb81cf409ec210242556e7ff39f6fa84907..c8cac497b5931c6be50bb2041854540f730cc947 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -43,15 +43,15 @@ your operating system. Please refer to the Wiki for details.
 
 OBTAINING HARDWARE:
 
-The Proxmark 3 is available for purchase (assembled and tested) from the
+The Proxmark3 is available for purchase (assembled and tested) from the
 following locations:
 
-   * http://proxmark3.com/
-   * http://www.xfpga.com/
-   * http://radiowar.taobao.com/
-   * http://www.elechouse.com/
-   * https://lab401.com/
-
+   * https://proxmark3.com/  - RyscCorp (us)
+   * http://www.elechouse.com/  - Elechouse (HK)
+   * https://lab401.com/ - Lab401 (FR)
+   * http://www.rfxsecure.com/  - RFxSecure (SG)
+   * http://proxmark3.tictail.com/ - IceSQL (SE)
+   
 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-

diff --git a/client/hardnested/tables/bitflip_0_0f1_states.bin b/client/hardnested/tables/bitflip_0_0f1_states.bin
new file mode 100644 (file)
index 0000000..5ead189
Binary files /dev/null and b/client/hardnested/tables/bitflip_0_0f1_states.bin differ

diff --git a/client/hardnested/tables/bitflip_0_2f1_states.bin b/client/hardnested/tables/bitflip_0_2f1_states.bin
new file mode 100644 (file)
index 0000000..4319ead
Binary files /dev/null and b/client/hardnested/tables/bitflip_0_2f1_states.bin differ