From: Iceman Date: Fri, 9 Jun 2017 13:50:55 +0000 (+0200) Subject: Merge pull request #315 from marshmellow42/master X-Git-Tag: v3.0.1^0 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/8040afa5ba915a022e28c0d61c81b773d4ed6686?hp=087c8bf3303e69d79cbbfdfb8edc836587cfb820 Merge pull request #315 from marshmellow42/master fix compile issues on OS X 10.11 --- diff --git a/.gitignore b/.gitignore index ca07dc12..52a9b55b 100644 --- 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 bb4dceb8..c8cac497 100644 --- 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 index 00000000..5ead1898 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 index 00000000..4319eadf Binary files /dev/null and b/client/hardnested/tables/bitflip_0_2f1_states.bin differ